format using rustfmt rust-lang#398

Author: prertik

src/book/bookitem.rs

@@ -27,7 +27,6 @@ pub struct BookItems<'a> {
 
 impl Chapter {
     pub fn new(name: String, path: PathBuf) -> Self {
-
         Chapter {
             name: name,
             path: path,
@@ -39,7 +38,8 @@ impl Chapter {
 
 impl Serialize for Chapter {
     fn serialize<S>(&self, serializer: S) -> ::std::result::Result<S::Ok, S::Error>
-        where S: Serializer
+    where
+        S: Serializer,
     {
         let mut struct_ = serializer.serialize_struct("Chapter", 2)?;
         struct_.serialize_field("name", &self.name)?;
@@ -69,8 +69,7 @@ impl<'a> Iterator for BookItems<'a> {
                 let cur = &self.items[self.current_index];
 
                 match *cur {
-                    BookItem::Chapter(_, ref ch) |
-                    BookItem::Affix(ref ch) => {
+                    BookItem::Chapter(_, ref ch) | BookItem::Affix(ref ch) => {
                         self.stack.push((self.items, self.current_index));
                         self.items = &ch.sub_items[..];
                         self.current_index = 0;

src/book/mod.rs

@@ -8,8 +8,8 @@ use std::io::{Read, Write};
 use std::process::Command;
 use tempdir::TempDir;
 
-use {theme, parse, utils};
-use renderer::{Renderer, HtmlHandlebars};
+use {parse, theme, utils};
+use renderer::{HtmlHandlebars, Renderer};
 use preprocess;
 use errors::*;
 
@@ -60,7 +60,6 @@ impl MDBook {
     /// [`set_dest()`](#method.set_dest)
 
     pub fn new<P: Into<PathBuf>>(root: P) -> MDBook {
-
         let root = root.into();
         if !root.exists() || !root.is_dir() {
             warn!("{:?} No directory with that name", root);
@@ -130,7 +129,6 @@ impl MDBook {
     /// `chapter_1.md` to the source directory.
 
     pub fn init(&mut self) -> Result<()> {
-
         debug!("[fn]: init");
 
         if !self.config.get_root().exists() {
@@ -139,7 +137,6 @@ impl MDBook {
         }
 
         {
-
             if !self.get_destination().exists() {
                 debug!("[*]: {:?} does not exist, trying to create directory", self.get_destination());
                 fs::create_dir_all(self.get_destination())?;
@@ -154,7 +151,6 @@ impl MDBook {
             let summary = self.config.get_source().join("SUMMARY.md");
 
             if !summary.exists() {
-
                 // Summary does not exist, create it
                 debug!("[*]: {:?} does not exist, trying to create SUMMARY.md", &summary);
                 let mut f = File::create(&summary)?;
@@ -175,16 +171,14 @@ impl MDBook {
             debug!("[*]: item: {:?}", item);
             let ch = match *item {
                 BookItem::Spacer => continue,
-                BookItem::Chapter(_, ref ch) |
-                BookItem::Affix(ref ch) => ch,
+                BookItem::Chapter(_, ref ch) | BookItem::Affix(ref ch) => ch,
             };
             if !ch.path.as_os_str().is_empty() {
                 let path = self.config.get_source().join(&ch.path);
 
                 if !path.exists() {
                     if !self.create_missing {
-                        return Err(format!("'{}' referenced from SUMMARY.md does not exist.", path.to_string_lossy())
-                                       .into());
+                        return Err(format!("'{}' referenced from SUMMARY.md does not exist.", path.to_string_lossy()).into());
                     }
                     debug!("[*]: {:?} does not exist, trying to create file", path);
                     ::std::fs::create_dir_all(path.parent().unwrap())?;
@@ -203,14 +197,15 @@ impl MDBook {
     pub fn create_gitignore(&self) {
         let gitignore = self.get_gitignore();
 
-        let destination = self.config.get_html_config()
-                                     .get_destination();
+        let destination = self.config.get_html_config().get_destination();
 
-        // Check that the gitignore does not extist and that the destination path begins with the root path
-        // We assume tha if it does begin with the root path it is contained within. This assumption
-        // will not hold true for paths containing double dots to go back up e.g. `root/../destination`
+        // Check that the gitignore does not extist and that the destination path
+        // begins with the root path
+        // We assume tha if it does begin with the root path it is contained within.
+        // This assumption
+        // will not hold true for paths containing double dots to go back up e.g.
+        // `root/../destination`
         if !gitignore.exists() && destination.starts_with(self.config.get_root()) {
-
             let relative = destination
                 .strip_prefix(self.config.get_root())
                 .expect("Could not strip the root prefix, path is not relative to root")
@@ -286,8 +281,7 @@ impl MDBook {
     }
 
     pub fn write_file<P: AsRef<Path>>(&self, filename: P, content: &[u8]) -> Result<()> {
-        let path = self.get_destination()
-            .join(filename);
+        let path = self.get_destination().join(filename);
 
         utils::fs::create_file(&path)?
             .write_all(content)
@@ -300,7 +294,6 @@ impl MDBook {
     /// The root directory is the one specified when creating a new `MDBook`
 
     pub fn read_config(mut self) -> Result<Self> {
-
         let toml = self.get_root().join("book.toml");
         let json = self.get_root().join("book.json");
 
@@ -356,31 +349,33 @@ impl MDBook {
     pub fn test(&mut self, library_paths: Vec<&str>) -> Result<()> {
         // read in the chapters
         self.parse_summary().chain_err(|| "Couldn't parse summary")?;
-        let library_args: Vec<&str> = (0..library_paths.len()).map(|_| "-L")
-                                                              .zip(library_paths.into_iter())
-                                                              .flat_map(|x| vec![x.0, x.1])
-                                                              .collect();
+        let library_args: Vec<&str> = (0..library_paths.len())
+            .map(|_| "-L")
+            .zip(library_paths.into_iter())
+            .flat_map(|x| vec![x.0, x.1])
+            .collect();
         let temp_dir = TempDir::new("mdbook")?;
         for item in self.iter() {
-
             if let BookItem::Chapter(_, ref ch) = *item {
                 if !ch.path.as_os_str().is_empty() {
-
                     let path = self.get_source().join(&ch.path);
-                    let base = path.parent().ok_or_else(
-                        || String::from("Invalid bookitem path!"),
-                    )?;
+                    let base = path.parent()
+                        .ok_or_else(|| String::from("Invalid bookitem path!"))?;
                     let content = utils::fs::file_to_string(&path)?;
                     // Parse and expand links
                     let content = preprocess::links::replace_all(&content, base)?;
                     println!("[*]: Testing file: {:?}", path);
 
-                    //write preprocessed file to tempdir
+                    // write preprocessed file to tempdir
                     let path = temp_dir.path().join(&ch.path);
                     let mut tmpf = utils::fs::create_file(&path)?;
                     tmpf.write_all(content.as_bytes())?;
 
-                    let output = Command::new("rustdoc").arg(&path).arg("--test").args(&library_args).output()?;
+                    let output = Command::new("rustdoc")
+                        .arg(&path)
+                        .arg("--test")
+                        .args(&library_args)
+                        .output()?;
 
                     if !output.status.success() {
                         bail!(ErrorKind::Subprocess("Rustdoc returned an error".to_string(), output));
@@ -398,15 +393,15 @@ impl MDBook {
 
     pub fn with_destination<T: Into<PathBuf>>(mut self, destination: T) -> Self {
         let root = self.config.get_root().to_owned();
-        self.config.get_mut_html_config()
+        self.config
+            .get_mut_html_config()
             .set_destination(&root, &destination.into());
         self
     }
 
 
     pub fn get_destination(&self) -> &Path {
-        self.config.get_html_config()
-            .get_destination()
+        self.config.get_html_config().get_destination()
     }
 
     pub fn with_source<T: Into<PathBuf>>(mut self, source: T) -> Self {
@@ -452,61 +447,56 @@ impl MDBook {
 
     pub fn with_theme_path<T: Into<PathBuf>>(mut self, theme_path: T) -> Self {
         let root = self.config.get_root().to_owned();
-        self.config.get_mut_html_config()
+        self.config
+            .get_mut_html_config()
             .set_theme(&root, &theme_path.into());
         self
     }
 
     pub fn get_theme_path(&self) -> &Path {
-        self.config.get_html_config()
-            .get_theme()
+        self.config.get_html_config().get_theme()
     }
 
     pub fn with_curly_quotes(mut self, curly_quotes: bool) -> Self {
-        self.config.get_mut_html_config()
+        self.config
+            .get_mut_html_config()
             .set_curly_quotes(curly_quotes);
         self
     }
 
     pub fn get_curly_quotes(&self) -> bool {
-        self.config.get_html_config()
-            .get_curly_quotes()
+        self.config.get_html_config().get_curly_quotes()
     }
 
     pub fn with_mathjax_support(mut self, mathjax_support: bool) -> Self {
-        self.config.get_mut_html_config()
+        self.config
+            .get_mut_html_config()
             .set_mathjax_support(mathjax_support);
         self
     }
 
     pub fn get_mathjax_support(&self) -> bool {
-        self.config.get_html_config()
-            .get_mathjax_support()
+        self.config.get_html_config().get_mathjax_support()
     }
 
     pub fn get_google_analytics_id(&self) -> Option<String> {
-        self.config.get_html_config()
-            .get_google_analytics_id()
+        self.config.get_html_config().get_google_analytics_id()
     }
 
     pub fn has_additional_js(&self) -> bool {
-        self.config.get_html_config()
-            .has_additional_js()
+        self.config.get_html_config().has_additional_js()
     }
 
     pub fn get_additional_js(&self) -> &[PathBuf] {
-        self.config.get_html_config()
-            .get_additional_js()
+        self.config.get_html_config().get_additional_js()
     }
 
     pub fn has_additional_css(&self) -> bool {
-        self.config.get_html_config()
-            .has_additional_css()
+        self.config.get_html_config().has_additional_css()
     }
 
     pub fn get_additional_css(&self) -> &[PathBuf] {
-        self.config.get_html_config()
-            .get_additional_css()
+        self.config.get_html_config().get_additional_css()
     }
 
     pub fn get_html_config(&self) -> &HtmlConfig {

src/config/bookconfig.rs

@@ -1,10 +1,11 @@
-use std::path::{PathBuf, Path};
+use std::path::{Path, PathBuf};
 
 use super::HtmlConfig;
 use super::tomlconfig::TomlConfig;
 use super::jsonconfig::JsonConfig;
 
-/// Configuration struct containing all the configuration options available in mdBook.
+/// Configuration struct containing all the configuration options available in
+/// mdBook.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct BookConfig {
     root: PathBuf,
@@ -21,8 +22,10 @@ pub struct BookConfig {
 }
 
 impl BookConfig {
-    /// Creates a new `BookConfig` struct with as root path the path given as parameter.
-    /// The source directory is `root/src` and the destination for the rendered book is `root/book`.
+    /// Creates a new `BookConfig` struct with as root path the path given as
+    /// parameter.
+    /// The source directory is `root/src` and the destination for the rendered
+    /// book is `root/book`.
     ///
     /// ```
     /// # use std::path::PathBuf;
@@ -32,8 +35,10 @@ impl BookConfig {
     /// let config = BookConfig::new(&root);
     ///
     /// assert_eq!(config.get_root(), &root);
-    /// assert_eq!(config.get_source(), PathBuf::from("directory/to/my/book/src"));
-    /// assert_eq!(config.get_html_config(), &HtmlConfig::new(PathBuf::from("directory/to/my/book")));
+    /// assert_eq!(config.get_source(),
+    /// PathBuf::from("directory/to/my/book/src"));
+    /// assert_eq!(config.get_html_config(),
+    /// &HtmlConfig::new(PathBuf::from("directory/to/my/book")));
     /// ```
     pub fn new<T: Into<PathBuf>>(root: T) -> Self {
         let root: PathBuf = root.into();
@@ -86,7 +91,6 @@ impl BookConfig {
     }
 
     pub fn fill_from_tomlconfig(&mut self, tomlconfig: TomlConfig) -> &mut Self {
-
         if let Some(s) = tomlconfig.source {
             self.set_source(s);
         }
@@ -112,11 +116,12 @@ impl BookConfig {
             self.get_mut_html_config()
                 .fill_from_tomlconfig(root, tomlhtmlconfig);
         }
-        
+
         self
     }
 
-    /// The JSON configuration file is **deprecated** and should not be used anymore.
+    /// The JSON configuration file is **deprecated** and should not be used
+    /// anymore.
     /// Please, migrate to the TOML configuration file.
     pub fn from_jsonconfig<T: Into<PathBuf>>(root: T, jsonconfig: JsonConfig) -> Self {
         let root = root.into();
@@ -125,10 +130,10 @@ impl BookConfig {
         config
     }
 
-    /// The JSON configuration file is **deprecated** and should not be used anymore.
+    /// The JSON configuration file is **deprecated** and should not be used
+    /// anymore.
     /// Please, migrate to the TOML configuration file.
     pub fn fill_from_jsonconfig(&mut self, jsonconfig: JsonConfig) -> &mut Self {
-
         if let Some(s) = jsonconfig.src {
             self.set_source(s);
         }
@@ -147,14 +152,12 @@ impl BookConfig {
 
         if let Some(d) = jsonconfig.dest {
             let root = self.get_root().to_owned();
-            self.get_mut_html_config()
-                .set_destination(&root, &d);
+            self.get_mut_html_config().set_destination(&root, &d);
         }
 
         if let Some(d) = jsonconfig.theme_path {
             let root = self.get_root().to_owned();
-            self.get_mut_html_config()
-                .set_theme(&root, &d);
+            self.get_mut_html_config().set_theme(&root, &d);
         }
 
         self
@@ -218,7 +221,8 @@ impl BookConfig {
         self
     }
 
-    /// Returns the configuration for the HTML renderer or None of there isn't any
+    /// Returns the configuration for the HTML renderer or None of there isn't
+    /// any
     pub fn get_html_config(&self) -> &HtmlConfig {
         &self.html_config
     }

src/config/htmlconfig.rs

@@ -1,4 +1,4 @@
-use std::path::{PathBuf, Path};
+use std::path::{Path, PathBuf};
 
 use super::tomlconfig::TomlHtmlConfig;
 use super::playpenconfig::PlaypenConfig;
@@ -16,7 +16,8 @@ pub struct HtmlConfig {
 }
 
 impl HtmlConfig {
-    /// Creates a new `HtmlConfig` struct containing the configuration parameters for the HTML renderer.
+    /// Creates a new `HtmlConfig` struct containing the configuration
+    /// parameters for the HTML renderer.
     ///
     /// ```
     /// # use std::path::PathBuf;