From 8dce00d54d946a7ee58e5053e8bec6c1d1ad4c69 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Thu, 30 May 2019 22:23:42 +0700 Subject: [PATCH 1/2] Cargo.toml: Sort dependencies fields --- Cargo.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 724bd1f0..5fa48958 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,24 +16,24 @@ repository = "https://github.com/rust-lang-nursery/mdBook" description = "Creates a book from markdown files" [dependencies] -clap = "2.24" chrono = "0.4" -handlebars = { version = "1.0", default-features = false, features = ["no_dir_source"] } -serde = "1.0" -serde_derive = "1.0" +clap = "2.24" +env_logger = "0.6" error-chain = "0.12" -serde_json = "1.0" -pulldown-cmark = "0.1.2" +handlebars = { version = "1.0", default-features = false, features = ["no_dir_source"] } +itertools = "0.8" lazy_static = "1.0" log = "0.4" -env_logger = "0.6" -toml = "0.4.8" memchr = "2.0" open = "1.1" +pulldown-cmark = "0.1.2" regex = "1.0.0" -tempfile = "3.0" -itertools = "0.8" +serde = "1.0" +serde_derive = "1.0" +serde_json = "1.0" shlex = "0.1" +tempfile = "3.0" +toml = "0.4.8" toml-query = "0.7" # Watch feature From 672cf456ebddebfb3e7044f0a521e505803ddc0a Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Thu, 30 May 2019 23:12:33 +0700 Subject: [PATCH 2/2] Remove unnecessary :: Find and replace with `git grep -E '\W::[a-z]'` command. --- src/book/mod.rs | 2 +- src/cmd/clean.rs | 2 +- src/cmd/watch.rs | 4 ++-- src/config.rs | 4 ++-- src/lib.rs | 18 +++++++++--------- src/main.rs | 2 +- tests/rendered_output.rs | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/book/mod.rs b/src/book/mod.rs index 3b25c68e..5453a2b4 100644 --- a/src/book/mod.rs +++ b/src/book/mod.rs @@ -68,7 +68,7 @@ impl MDBook { config.update_from_env(); - if log_enabled!(::log::Level::Trace) { + if log_enabled!(log::Level::Trace) { for line in format!("Config: {:#?}", config).lines() { trace!("{}", line); } diff --git a/src/cmd/clean.rs b/src/cmd/clean.rs index 420037d7..07c2fbc6 100644 --- a/src/cmd/clean.rs +++ b/src/cmd/clean.rs @@ -21,7 +21,7 @@ pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> { } // Clean command implementation -pub fn execute(args: &ArgMatches) -> ::mdbook::errors::Result<()> { +pub fn execute(args: &ArgMatches) -> mdbook::errors::Result<()> { let book_dir = get_book_dir(args); let book = MDBook::load(&book_dir)?; diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs index aa1594fa..bf903f90 100644 --- a/src/cmd/watch.rs +++ b/src/cmd/watch.rs @@ -63,14 +63,14 @@ where Ok(w) => w, Err(e) => { error!("Error while trying to watch the files:\n\n\t{:?}", e); - ::std::process::exit(1) + std::process::exit(1) } }; // Add the source directory to the watcher if let Err(e) = watcher.watch(book.source_dir(), Recursive) { error!("Error while watching {:?}:\n {:?}", book.source_dir(), e); - ::std::process::exit(1); + std::process::exit(1); }; let _ = watcher.watch(book.theme_dir(), Recursive); diff --git a/src/config.rs b/src/config.rs index b3707d8e..ae15b29b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -268,7 +268,7 @@ impl Default for Config { } } impl<'de> Deserialize<'de> for Config { - fn deserialize>(de: D) -> ::std::result::Result { + fn deserialize>(de: D) -> std::result::Result { let raw = Value::deserialize(de)?; if is_legacy_format(&raw) { @@ -312,7 +312,7 @@ impl<'de> Deserialize<'de> for Config { } impl Serialize for Config { - fn serialize(&self, s: S) -> ::std::result::Result { + fn serialize(&self, s: S) -> std::result::Result { use serde::ser::Error; let mut table = self.rest.clone(); diff --git a/src/lib.rs b/src/lib.rs index 0494d984..e5fe7f45 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -122,20 +122,20 @@ pub mod errors { error_chain! { foreign_links { - Io(::std::io::Error) #[doc = "A wrapper around `std::io::Error`"]; - HandlebarsRender(::handlebars::RenderError) #[doc = "Handlebars rendering failed"]; - HandlebarsTemplate(Box<::handlebars::TemplateError>) #[doc = "Unable to parse the template"]; - Utf8(::std::string::FromUtf8Error) #[doc = "Invalid UTF-8"]; - SerdeJson(::serde_json::Error) #[doc = "JSON conversion failed"]; + Io(std::io::Error) #[doc = "A wrapper around `std::io::Error`"]; + HandlebarsRender(handlebars::RenderError) #[doc = "Handlebars rendering failed"]; + HandlebarsTemplate(Box) #[doc = "Unable to parse the template"]; + Utf8(std::string::FromUtf8Error) #[doc = "Invalid UTF-8"]; + SerdeJson(serde_json::Error) #[doc = "JSON conversion failed"]; } links { - TomlQuery(::toml_query::error::Error, ::toml_query::error::ErrorKind) #[doc = "A TomlQuery error"]; + TomlQuery(toml_query::error::Error, toml_query::error::ErrorKind) #[doc = "A TomlQuery error"]; } errors { /// A subprocess exited with an unsuccessful return code. - Subprocess(message: String, output: ::std::process::Output) { + Subprocess(message: String, output: std::process::Output) { description("A subprocess failed") display("{}: {}", message, String::from_utf8_lossy(&output.stdout)) } @@ -155,8 +155,8 @@ pub mod errors { } // Box to halve the size of Error - impl From<::handlebars::TemplateError> for Error { - fn from(e: ::handlebars::TemplateError) -> Error { + impl From for Error { + fn from(e: handlebars::TemplateError) -> Error { From::from(Box::new(e)) } } diff --git a/src/main.rs b/src/main.rs index 22aac744..14aad67a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -58,7 +58,7 @@ fn main() { if let Err(e) = res { utils::log_backtrace(&e); - ::std::process::exit(101); + std::process::exit(101); } } diff --git a/tests/rendered_output.rs b/tests/rendered_output.rs index 12aa3a3b..dfee1793 100644 --- a/tests/rendered_output.rs +++ b/tests/rendered_output.rs @@ -403,7 +403,7 @@ fn theme_dir_overrides_work_correctly() { let book_dir = book_dir.path(); let theme_dir = book_dir.join("theme"); - let mut index = ::mdbook::theme::INDEX.to_vec(); + let mut index = mdbook::theme::INDEX.to_vec(); index.extend_from_slice(b"\n"); write_file(&theme_dir, "index.hbs", &index).unwrap();