diff --git a/Cargo.toml b/Cargo.toml index bf4bded0..66398ea3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,4 +57,4 @@ name = "mdbook" path = "src/bin/mdbook.rs" [dev-dependencies] -pretty_assertions = "0.2.1" \ No newline at end of file +pretty_assertions = "0.2.1" diff --git a/book-example/src/misc/contributors.md b/book-example/src/misc/contributors.md index 36b50fad..6c91f660 100644 --- a/book-example/src/misc/contributors.md +++ b/book-example/src/misc/contributors.md @@ -11,3 +11,4 @@ If you have contributed to mdBook and I forgot to add you, don't hesitate to add - Wayne Nilsen ([waynenilsen](https://github.com/waynenilsen)) - [funnkill](https://github.com/funkill) - Fu Gangqiang ([FuGangqiang](https://github.com/FuGangqiang)) +- Michael Bryan ([Michael-F-Bryan](https://github.com/Michael-F-Bryan)) diff --git a/src/lib.rs b/src/lib.rs index b4fee9a9..b3c373db 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -104,6 +104,9 @@ pub use renderer::Renderer; /// The error types used through out this crate. pub mod errors { + // needed temporarily because of https://github.com/rust-lang-nursery/error-chain/issues/208 + #![allow(unknown_lints, unused_doc_comment)] + error_chain!{ foreign_links { Io(::std::io::Error); diff --git a/src/renderer/html_handlebars/hbs_renderer.rs b/src/renderer/html_handlebars/hbs_renderer.rs index 1286d3aa..0b2138bb 100644 --- a/src/renderer/html_handlebars/hbs_renderer.rs +++ b/src/renderer/html_handlebars/hbs_renderer.rs @@ -12,7 +12,7 @@ use regex::{Regex, Captures}; use std::ascii::AsciiExt; use std::path::{Path, PathBuf}; use std::fs::{self, File}; -use std::io::{self, Read}; +use std::io::Read; use std::collections::BTreeMap; use std::collections::HashMap;