Skip to content

Commit a01e476

Browse files
committed
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
2 parents eb53c10 + 3cd32d9 commit a01e476

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/bootstrap/builder.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,8 @@ impl<'a> Builder<'a> {
442442
doc::RustdocBook,
443443
doc::RustByExample,
444444
doc::RustcBook,
445-
doc::CargoBook
445+
doc::CargoBook,
446+
doc::EditionGuide,
446447
),
447448
Kind::Dist => describe!(
448449
dist::Docs,

src/doc/edition-guide

src/stage0.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2018-12-03
15+
date: 2018-12-06
1616
rustc: 1.31.0
1717
cargo: 0.32.0
1818

@@ -34,4 +34,4 @@ cargo: 0.32.0
3434
# looking at a beta source tarball and it's uncommented we'll shortly comment it
3535
# out.
3636

37-
dev: 1
37+
#dev: 1

0 commit comments

Comments
 (0)