cli: Remove externs and macro_use as part of using Rust 2018.

This commit is contained in:
Dorian 2020-01-23 08:20:43 -05:00
parent 292a61b559
commit 090497890d
4 changed files with 5 additions and 34 deletions

View File

@ -1,5 +1,7 @@
use colored::Colorize; use colored::Colorize;
use env_logger::{Builder, Env, Target}; use env_logger::{Builder, Env, Target};
use log::{debug, error, info};
use serde::Deserialize;
pub const USAGE: &str = " pub const USAGE: &str = "

View File

@ -1,17 +1,7 @@
extern crate chrono;
extern crate colored;
extern crate directories;
#[macro_use]
extern crate log;
extern crate serde;
#[macro_use]
extern crate serde_derive;
extern crate serde_json;
extern crate zip;
use std::{collections::HashMap, default::Default}; use std::{collections::HashMap, default::Default};
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
use serde_json::Value; use serde_json::Value;
pub mod cli; pub mod cli;

View File

@ -1,28 +1,9 @@
extern crate chrono;
extern crate docopt;
extern crate env_logger;
#[macro_use]
extern crate serde_json;
extern crate actix_files;
extern crate actix_web;
extern crate colored;
#[macro_use]
extern crate log;
extern crate notify;
extern crate opener;
extern crate tera;
extern crate toml;
extern crate uuid;
extern crate rookeries;
use actix_web::{middleware::Logger, App, HttpServer}; use actix_web::{middleware::Logger, App, HttpServer};
use chrono::prelude::*; use chrono::prelude::*;
use colored::Colorize; use colored::Colorize;
use docopt::Docopt; use docopt::Docopt;
use log::{debug, info};
use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher}; use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
use rookeries::{ use rookeries::{
cli::{ cli::{
caution_message, details_message, error_message, header_message, initialize_logging, caution_message, details_message, error_message, header_message, initialize_logging,
@ -35,7 +16,7 @@ use rookeries::{
}, },
template, Page, Site, template, Page, Site,
}; };
use serde_json::Value; use serde_json::{json, Value};
use std::{ use std::{
collections::HashMap, collections::HashMap,
ffi::OsString, ffi::OsString,

View File

@ -1,5 +1,3 @@
extern crate rookeries;
use rand::{thread_rng, Rng}; use rand::{thread_rng, Rng};
use regex::Regex; use regex::Regex;
use rookeries::{Page, Site}; use rookeries::{Page, Site};