Merge pull request #908 from lzutao/fmt

Formatting whole project

src/book/book.rs

@@ -481,7 +481,8 @@ And here is some \
             .filter_map(|i| match *i {
                 BookItem::Chapter(ref ch) => Some(ch.name.clone()),
                 _ => None,
-            }).collect();
+            })
+            .collect();
         let should_be: Vec<_> = vec![
             String::from("Chapter 1"),
             String::from("Hello World"),

src/book/mod.rs

@@ -99,7 +99,7 @@ impl MDBook {
     pub fn load_with_config_and_summary<P: Into<PathBuf>>(
         book_root: P,
         config: Config,
-        summary: Summary
+        summary: Summary,
     ) -> Result<MDBook> {
         let root = book_root.into();
 

src/book/summary.rs

@@ -477,7 +477,8 @@ fn stringify_events(events: Vec<Event>) -> String {
         .filter_map(|t| match t {
             Event::Text(text) => Some(text.into_owned()),
             _ => None,
-        }).collect()
+        })
+        .collect()
 }
 
 /// A section number like "1.2.3", basically just a newtype'd `Vec<u32>` with

src/cmd/build.rs

@@ -11,10 +11,12 @@ pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> {
             "-d, --dest-dir=[dest-dir] 'Output directory for the book{n}\
              Relative paths are interpreted relative to the book's root directory.{n}\
              If omitted, mdBook uses build.build-dir from book.toml or defaults to `./book`.'",
-        ).arg_from_usage(
+        )
+        .arg_from_usage(
             "[dir] 'Root directory for the book{n}\
              (Defaults to the Current Directory when omitted)'",
-        ).arg_from_usage("-o, --open 'Opens the compiled book in a web browser'")
+        )
+        .arg_from_usage("-o, --open 'Opens the compiled book in a web browser'")
 }
 
 // Build command implementation

src/cmd/clean.rs

@@ -13,7 +13,8 @@ pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> {
              Relative paths are interpreted relative to the book's root directory.{n}\
              Running this command deletes this directory.{n}\
              If omitted, mdBook uses build.build-dir from book.toml or defaults to `./book`.'",
-        ).arg_from_usage(
+        )
+        .arg_from_usage(
             "[dir] 'Root directory for the book{n}\
              (Defaults to the Current Directory when omitted)'",
         )

src/cmd/init.rs

@@ -15,7 +15,8 @@ pub fn make_subcommand<'a, 'b>() -> App<'a, 'b> {
         .arg_from_usage(
             "[dir] 'Directory to create the book in{n}\
              (Defaults to the Current Directory when omitted)'",
-        ).arg_from_usage("--theme 'Copies the default theme into your source folder'")
+        )
+        .arg_from_usage("--theme 'Copies the default theme into your source folder'")
         .arg_from_usage("--force 'Skips confirmation prompts'")
 }
 

src/cmd/serve.rs

@@ -126,7 +126,8 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
                 b.config
                     .set("output.html.livereload-url", &livereload_url)?;
                 Ok(b)
-            }).and_then(|b| b.build());
+            })
+            .and_then(|b| b.build());
 
         if let Err(e) = result {
             error!("Unable to load the book");

src/cmd/watch.rs

@@ -7,8 +7,8 @@ use mdbook::utils;
 use mdbook::MDBook;
 use std::path::{Path, PathBuf};
 use std::sync::mpsc::channel;
-use std::time::Duration;
 use std::thread::sleep;
+use std::time::Duration;
 use {get_book_dir, open};
 
 // Create clap subcommand arguments

src/lib.rs

@@ -129,7 +129,7 @@ pub use renderer::Renderer;
 pub mod errors {
     use std::path::PathBuf;
 
-    error_chain!{
+    error_chain! {
         foreign_links {
             Io(::std::io::Error) #[doc = "A wrapper around `std::io::Error`"];
             HandlebarsRender(::handlebars::RenderError) #[doc = "Handlebars rendering failed"];

src/preprocess/links.rs

@@ -143,17 +143,19 @@ fn parse_include_path(path: &str) -> LinkType<'static> {
     match start {
         Some(start) => match end {
             Some(end) => LinkType::IncludeRange(path, Range { start, end }),
-            None => if has_end {
+            None => {
-                LinkType::IncludeRangeFrom(path, RangeFrom { start })
+                if has_end {
-            } else {
+                    LinkType::IncludeRangeFrom(path, RangeFrom { start })
-                LinkType::IncludeRange(
+                } else {
-                    path,
+                    LinkType::IncludeRange(
-                    Range {
+                        path,
-                        start,
+                        Range {
-                        end: start + 1,
+                            start,
-                    },
+                            end: start + 1,
-                )
+                        },
-            },
+                    )
+                }
+            }
         },
         None => match end {
             Some(end) => LinkType::IncludeRangeTo(path, RangeTo { end }),
@@ -304,7 +306,8 @@ fn find_links(contents: &str) -> LinkIter {
             \s+                        # separating whitespace
             ([a-zA-Z0-9\s_.\-:/\\]+)   # link target path and space separated properties
             \s*\}\}                    # whitespace and link closing parens"
-        ).unwrap();
+        )
+        .unwrap();
     }
     LinkIter(RE.captures_iter(contents))
 }

src/renderer/html_handlebars/hbs_renderer.rs

@@ -36,7 +36,11 @@ impl HtmlHandlebars {
 
             let string_path = ch.path.parent().unwrap().display().to_string();
 
-            let fixed_content = utils::render_markdown_with_base(&ch.content, ctx.html_config.curly_quotes, &string_path);
+            let fixed_content = utils::render_markdown_with_base(
+                &ch.content,
+                ctx.html_config.curly_quotes,
+                &string_path,
+            );
             print_content.push_str(&fixed_content);
 
             // Update the context with data for this file
@@ -507,7 +511,8 @@ fn build_header_links(html: &str) -> String {
                 .expect("Regex should ensure we only ever get numbers here");
 
             wrap_header_with_link(level, &caps[2], &mut id_counter)
-        }).into_owned()
+        })
+        .into_owned()
 }
 
 /// Wraps a single header tag with a link, making sure each tag gets its own
@@ -558,7 +563,8 @@ fn fix_code_blocks(html: &str) -> String {
                 classes = classes,
                 after = after
             )
-        }).into_owned()
+        })
+        .into_owned()
 }
 
 fn add_playpen_pre(html: &str, playpen_config: &Playpen) -> String {
@@ -594,7 +600,8 @@ fn add_playpen_pre(html: &str, playpen_config: &Playpen) -> String {
                 // not language-rust, so no-op
                 text.to_owned()
             }
-        }).into_owned()
+        })
+        .into_owned()
 }
 
 fn partition_source(s: &str) -> (String, String) {

src/renderer/html_handlebars/helpers/navigation.rs

@@ -178,23 +178,23 @@ mod tests {
     #[test]
     fn test_next_previous() {
         let data = json!({
-         "name": "two",
+           "name": "two",
-         "path": "two.path",
+           "path": "two.path",
-         "chapters": [
+           "chapters": [
-            {
+              {
-               "name": "one",
+                 "name": "one",
-               "path": "one.path"
+                 "path": "one.path"
-            },
+              },
-            {
+              {
-               "name": "two",
+                 "name": "two",
-               "path": "two.path",
+                 "path": "two.path",
-            },
+              },
-            {
+              {
-               "name": "three",
+                 "name": "three",
-               "path": "three.path"
+                 "path": "three.path"
-            }
+              }
-         ]
+           ]
-      });
+        });
 
         let mut h = Handlebars::new();
         h.register_helper("previous", Box::new(previous));
@@ -209,23 +209,23 @@ mod tests {
     #[test]
     fn test_first() {
         let data = json!({
-         "name": "one",
+           "name": "one",
-         "path": "one.path",
+           "path": "one.path",
-         "chapters": [
+           "chapters": [
-            {
+              {
-               "name": "one",
+                 "name": "one",
-               "path": "one.path"
+                 "path": "one.path"
-            },
+              },
-            {
+              {
-               "name": "two",
+                 "name": "two",
-               "path": "two.path",
+                 "path": "two.path",
-            },
+              },
-            {
+              {
-               "name": "three",
+                 "name": "three",
-               "path": "three.path"
+                 "path": "three.path"
-            }
+              }
-         ]
+           ]
-      });
+        });
 
         let mut h = Handlebars::new();
         h.register_helper("previous", Box::new(previous));
@@ -239,23 +239,23 @@ mod tests {
     #[test]
     fn test_last() {
         let data = json!({
-         "name": "three",
+           "name": "three",
-         "path": "three.path",
+           "path": "three.path",
-         "chapters": [
+           "chapters": [
-            {
+              {
-               "name": "one",
+                 "name": "one",
-               "path": "one.path"
+                 "path": "one.path"
-            },
+              },
-            {
+              {
-               "name": "two",
+                 "name": "two",
-               "path": "two.path",
+                 "path": "two.path",
-            },
+              },
-            {
+              {
-               "name": "three",
+                 "name": "three",
-               "path": "three.path"
+                 "path": "three.path"
-            }
+              }
-         ]
+           ]
-      });
+        });
 
         let mut h = Handlebars::new();
         h.register_helper("previous", Box::new(previous));

src/utils/mod.rs

@@ -34,7 +34,8 @@ pub fn normalize_id(content: &str) -> String {
             } else {
                 None
             }
-        }).collect::<String>()
+        })
+        .collect::<String>()
 }
 
 /// Generate an ID for use with anchors which is derived from a "normalised"
@@ -195,7 +196,8 @@ fn convert_quotes_to_curly(original_text: &str) -> String {
             preceded_by_whitespace = original_char.is_whitespace();
 
             converted_char
-        }).collect()
+        })
+        .collect()
 }
 
 /// Prints a "backtrace" of some `Error`.

tests/rendered_output.rs

@@ -30,8 +30,12 @@ const TOC_TOP_LEVEL: &[&'static str] = &[
     "Dummy Book",
     "Introduction",
 ];
-const TOC_SECOND_LEVEL: &[&'static str] =
+const TOC_SECOND_LEVEL: &[&'static str] = &[
-    &["1.1. Nested Chapter", "1.2. Includes", "2.1. Nested Chapter", "1.3. Recursive"];
+    "1.1. Nested Chapter",
+    "1.2. Includes",
+    "2.1. Nested Chapter",
+    "1.3. Recursive",
+];
 
 /// Make sure you can load the dummy book and build it without panicking.
 #[test]