Auto merge of #56626 - alexcrichton:update-beta, r=pietroalbini

[beta] Swith to released bootstrap compiler * Also update the Cargo submodule to the 1.32 branch at the same time for a few beta fixes. * Include beta-nominated #56519
rust-lang · Dec 8, 2018 · a01e476 · a01e476
2 parents eb53c10 + 3cd32d9
commit a01e476
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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,

diff --git a/src/doc/edition-guide b/src/doc/edition-guide
diff --git a/src/stage0.txt b/src/stage0.txt
@@ -12,7 +12,7 @@
 # source tarball for a stable release you'll likely see `1.x.0` for rustc and
 # `0.x.0` for Cargo where they were released on `date`.
 
-date: 2018-12-03
+date: 2018-12-06
 rustc: 1.31.0
 cargo: 0.32.0
 
@@ -34,4 +34,4 @@ cargo: 0.32.0
 # looking at a beta source tarball and it's uncommented we'll shortly comment it
 # out.
 
-dev: 1
+#dev: 1
diff --git a/src/tools/cargo b/src/tools/cargo
+6 −12		src/bin/cargo/cli.rs
+1 −1		src/bin/cargo/commands/build.rs
+1 −1		src/bin/cargo/commands/check.rs
+7 −21		src/bin/cargo/commands/mod.rs
+1 −1		src/bin/cargo/commands/run.rs
+1 −1		src/bin/cargo/commands/test.rs
+21 −22		src/bin/cargo/main.rs
+19 −9		src/cargo/core/package.rs
+14 −0		tests/testsuite/cargo_alias_config.rs