Auto merge of #56519 - steveklabnik:edition-guide, r=pietroalbini

update edition guide spiritual successor to https://github.com/rust-lang/rust/pull/56457 not to be backported, being in nightly is enough. i'm testing this locally now but figure travis can test it in parallel
2018-12-05 02:24:35 +00:00 · 2018-12-05 02:24:35 +00:00 · d8046ed51a
commit d8046ed51a
parent b3af09205b 6b0ac4987a
2 changed files with 3 additions and 2 deletions
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@ -442,7 +442,8 @@ impl<'a> Builder<'a> {
                doc::RustdocBook,
                doc::RustByExample,
                doc::RustcBook,
-                doc::CargoBook
+                doc::CargoBook,
+                doc::EditionGuide,
            ),
            Kind::Dist => describe!(
                dist::Docs,
--- a/src/doc/edition-guide
+++ b/src/doc/edition-guide
@ -1 +1 @@
-Subproject commit 850ea159d0fcf44dfbff16148faf9b5162481f89
+Subproject commit 419edb885ec1a98c0747b3907003d79e3e6b93a9