Skip to content

Commit 1351760

Browse files
Rollup merge of rust-lang#58800 - ehuss:update-books, r=Centril
Update edition-guide 15 commits in 419edb885ec1a98c0747b3907003d79e3e6b93a9..5f3cc2a5618700efcde3bc00799744f21fa9ad2e 2018-12-04 16:43:38 -0500 to 2019-02-27 20:11:50 -0800 - Migrate to mdbook 0.2. (rust-lang/edition-guide#152) - Remove automatic deployment. (rust-lang/edition-guide#151) - Fix issue with rust's linkchecker and mdbook. (rust-lang/edition-guide#147) - Fix test now that overflowing_literals is rejected in all editions. (rust-lang/edition-guide#148) - overflowing_literals is deny on all editions (rust-lang/edition-guide#146) - Update for uniform_path stabilization. (rust-lang/edition-guide#141) - Add example to rustup to show overriding to specific version (rust-lang/edition-guide#144) - Update for anonymous-lifetime stabilization. (rust-lang/edition-guide#142) - Add minimum Rust version for Kleene operator (rust-lang/edition-guide#137) - Add 2018-specific changes. (rust-lang/edition-guide#130) - aborting-on-panic.md: Typo in example config (rust-lang/edition-guide#125) - Clarify uniform paths are not yet in Rust 2018 (rust-lang/edition-guide#124) - update several version numbers - Fixes outdated link (rust-lang/edition-guide#131) - Fixed typo in transitioning page. (rust-lang/edition-guide#127)
2 parents defda22 + 3aca176 commit 1351760

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/bootstrap/doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ macro_rules! book {
6060
// NOTE: When adding a book here, make sure to ALSO build the book by
6161
// adding a build step in `src/bootstrap/builder.rs`!
6262
book!(
63-
EditionGuide, "src/doc/edition-guide", "edition-guide", RustbookVersion::MdBook1;
63+
EditionGuide, "src/doc/edition-guide", "edition-guide", RustbookVersion::MdBook2;
6464
EmbeddedBook, "src/doc/embedded-book", "embedded-book", RustbookVersion::MdBook2;
6565
Nomicon, "src/doc/nomicon", "nomicon", RustbookVersion::MdBook1;
6666
Reference, "src/doc/reference", "reference", RustbookVersion::MdBook1;

src/doc/edition-guide

0 commit comments

Comments
 (0)