rust-lang · bors · Jun 21, 2019 · Jun 19, 2019 · steveklabnik · Jun 20, 2019
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
@@ -61,19 +61,19 @@ macro_rules! book {
 // NOTE: When adding a book here, make sure to ALSO build the book by
 // adding a build step in `src/bootstrap/builder.rs`!
 book!(
-    EditionGuide, "src/doc/edition-guide", "edition-guide", RustbookVersion::MdBook2;
-    EmbeddedBook, "src/doc/embedded-book", "embedded-book", RustbookVersion::MdBook2;
-    Nomicon, "src/doc/nomicon", "nomicon", RustbookVersion::MdBook2;
+    EditionGuide, "src/doc/edition-guide", "edition-guide", RustbookVersion::Latest;
+    EmbeddedBook, "src/doc/embedded-book", "embedded-book", RustbookVersion::Latest;
+    Nomicon, "src/doc/nomicon", "nomicon", RustbookVersion::Latest;
     Reference, "src/doc/reference", "reference", RustbookVersion::MdBook1;
-    RustByExample, "src/doc/rust-by-example", "rust-by-example", RustbookVersion::MdBook2;
+    RustByExample, "src/doc/rust-by-example", "rust-by-example", RustbookVersion::Latest;
     RustcBook, "src/doc/rustc", "rustc", RustbookVersion::MdBook1;
-    RustdocBook, "src/doc/rustdoc", "rustdoc", RustbookVersion::MdBook2;
+    RustdocBook, "src/doc/rustdoc", "rustdoc", RustbookVersion::Latest;
 );
 
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 enum RustbookVersion {
     MdBook1,
-    MdBook2,
+    Latest,
 }
 
 fn doc_src(builder: &Builder<'_>) -> Interned<PathBuf> {
@@ -108,7 +108,7 @@ impl Step for UnstableBook {
             target: self.target,
             name: INTERNER.intern_str("unstable-book"),
             src: builder.md_doc_out(self.target),
-            version: RustbookVersion::MdBook2,
+            version: RustbookVersion::Latest,
         })
     }
 }
@@ -196,7 +196,7 @@ impl Step for RustbookSrc {
 
         let vers = match self.version {
             RustbookVersion::MdBook1 => "1",
-            RustbookVersion::MdBook2 => "2",
+            RustbookVersion::Latest => "3",
         };
 
         builder.run(rustbook_cmd
@@ -251,7 +251,7 @@ impl Step for TheBook {
         builder.ensure(RustbookSrc {
             target,
             name: INTERNER.intern_string(name.to_string()),
-            version: RustbookVersion::MdBook2,
+            version: RustbookVersion::Latest,
             src: doc_src(builder),
         });
 
@@ -261,23 +261,23 @@ impl Step for TheBook {
         builder.ensure(RustbookSrc {
             target,
             name: INTERNER.intern_string(source_name),
-            version: RustbookVersion::MdBook2,
+            version: RustbookVersion::Latest,
             src: doc_src(builder),
         });
 
         let source_name = format!("{}/second-edition", name);
         builder.ensure(RustbookSrc {
             target,
             name: INTERNER.intern_string(source_name),
-            version: RustbookVersion::MdBook2,
+            version: RustbookVersion::Latest,
             src: doc_src(builder),
         });
 
         let source_name = format!("{}/2018-edition", name);
         builder.ensure(RustbookSrc {
             target,
             name: INTERNER.intern_string(source_name),
-            version: RustbookVersion::MdBook2,
+            version: RustbookVersion::Latest,
             src: doc_src(builder),
         });
 

diff --git a/src/doc/book b/src/doc/book
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
diff --git a/src/doc/embedded-book b/src/doc/embedded-book
diff --git a/src/doc/reference b/src/doc/reference
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
diff --git a/src/doc/rustc-guide b/src/doc/rustc-guide
diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml
@@ -8,9 +8,8 @@ edition = "2018"
 [dependencies]
 clap = "2.25.0"
 
-[dependencies.mdbook_2]
-package = "mdbook"
-version = "0.2.3"
+[dependencies.mdbook]
+version = "0.3.0"
 default-features = false
 features = ["search"]
 

diff --git a/src/tools/rustbook/src/main.rs b/src/tools/rustbook/src/main.rs
@@ -10,8 +10,8 @@ use clap::{App, ArgMatches, SubCommand, AppSettings};
 use mdbook_1::{MDBook as MDBook1};
 use mdbook_1::errors::{Result as Result1};
 
-use mdbook_2::{MDBook as MDBook2};
-use mdbook_2::errors::{Result as Result2};
+use mdbook::MDBook;
+use mdbook::errors::Result;
 
 fn main() {
     let d_message = "-d, --dest-dir=[dest-dir]
@@ -48,8 +48,8 @@ fn main() {
                         ::std::process::exit(101);
                     }
                 }
-                Some("2") => {
-                    if let Err(e) = build_2(sub_matches) {
+                Some("2") | Some("3") => {
+                    if let Err(e) = build(sub_matches) {
                         eprintln!("Error: {}", e);
 
                         for cause in e.iter().skip(1) {
@@ -60,7 +60,7 @@ fn main() {
                     }
                 }
                 _ => {
-                    panic!("Invalid mdBook version! Select '1' or '2'");
+                    panic!("Invalid mdBook version! Select '1' or '2' or '3'");
                 }
             };
         },
@@ -86,9 +86,9 @@ pub fn build_1(args: &ArgMatches<'_>) -> Result1<()> {
 }
 
 // Build command implementation
-pub fn build_2(args: &ArgMatches<'_>) -> Result2<()> {
+pub fn build(args: &ArgMatches<'_>) -> Result<()> {
     let book_dir = get_book_dir(args);
-    let mut book = MDBook2::load(&book_dir)?;
+    let mut book = MDBook::load(&book_dir)?;
 
     // Set this to allow us to catch bugs in advance.
     book.config.build.create_missing = false;
+1 −1		CONTRIBUTING.md
+2 −2		README.md
+1 −0		ci/dictionary.txt
+0 −54		nostarch/chapter18-destructuring-nested-structs-and-enums.md
+0 −31		nostarch/chapter19-new-function-pointer-text.md
+0 −579		nostarch/chapter19.md
+ −		nostarch/docx/chapter18-destructuring-nested-structs-and-enums.docx
+ −		nostarch/docx/chapter19-new-function-pointer-text.docx
+ −		nostarch/docx/chapter19.docx
+6 −6		src/appendix-02-operators.md
+6 −6		src/appendix-03-derivable-traits.md
+5 −5		src/appendix-04-useful-development-tools.md
+1 −0		src/appendix-05-editions.md
+1 −0		src/appendix-06-translation.md
+4 −4		src/ch01-03-hello-cargo.md
+5 −5		src/ch02-00-guessing-game-tutorial.md
+5 −4		src/ch03-02-data-types.md
+3 −2		src/ch03-05-control-flow.md
+13 −14		src/ch07-00-managing-growing-projects-with-packages-crates-and-modules.md
+8 −6		src/ch07-01-packages-and-crates.md
+23 −23		src/ch07-02-defining-modules-to-control-scope-and-privacy.md
+17 −16		src/ch07-03-paths-for-referring-to-an-item-in-the-module-tree.md
+10 −10		src/ch07-04-bringing-paths-into-scope-with-the-use-keyword.md
+1 −1		src/ch08-02-strings.md
+4 −3		src/ch08-03-hash-maps.md
+3 −3		src/ch09-01-unrecoverable-errors-with-panic.md
+8 −7		src/ch10-02-traits.md
+10 −9		src/ch10-03-lifetime-syntax.md
+8 −8		src/ch11-01-writing-tests.md
+1 −1		src/ch12-01-accepting-command-line-arguments.md
+9 −8		src/ch12-03-improving-error-handling-and-modularity.md
+2 −2		src/ch14-00-more-about-cargo.md
+9 −9		src/ch14-02-publishing-to-crates-io.md
+5 −5		src/ch14-03-cargo-workspaces.md
+1 −1		src/ch14-04-installing-binaries.md
+2 −2		src/ch14-05-extending-cargo.md
+2 −2		src/ch16-04-extensible-concurrency-sync-and-send.md
+11 −11		src/ch17-02-trait-objects.md
+8 −7		src/ch18-01-all-the-places-for-patterns.md
+17 −18		src/ch19-01-unsafe-rust.md
+21 −21		src/ch19-03-advanced-traits.md
+8 −8		src/ch19-04-advanced-types.md
+3 −3		src/ch19-05-advanced-functions-and-closures.md
+24 −23		src/ch19-06-macros.md
+3 −2		src/ch20-00-final-project-a-web-server.md
+3 −3		src/ch20-03-graceful-shutdown-and-cleanup.md
+22 −0		tools/megadiff.sh
+1 −0		tools/src/bin/link2print.rs
+2 −2		tools/src/bin/remove_links.rs
+1 −1		src/custom_types/enum.md
+0 −1		src/error/multiple_error_types/reenter_question_mark.md
+3 −0		src/error/result/enter_question_mark.md
+2 −2		src/macros.md
+4 −4		src/macros/designators.md
+5 −5		src/macros/dry.md
+4 −4		src/macros/overload.md
+1 −1		src/macros/repeat.md