nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-07 20:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[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 https://github.com/rust-lang/rust/pull/56519
This commit is contained in:
bors 2018-12-08 12:20:19 +00:00
commit a01e4761a1
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bootstrap/builder.rs
View File

@ -442,7 +442,8 @@ impl<'a> Builder<'a> {
doc::RustdocBook, doc::RustdocBook,
doc::RustByExample, doc::RustByExample,
doc::RustcBook, doc::RustcBook,
doc::CargoBook doc::CargoBook,
doc::EditionGuide,
), ),
Kind::Dist => describe!( Kind::Dist => describe!(
dist::Docs, dist::Docs,

2
src/doc/edition-guide

@ -1 +1 @@
Subproject commit 850ea159d0fcf44dfbff16148faf9b5162481f89 Subproject commit 419edb885ec1a98c0747b3907003d79e3e6b93a9

4
src/stage0.txt
View File

@ -12,7 +12,7 @@
# source tarball for a stable release you'll likely see `1.x.0` for rustc and # 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`. # `0.x.0` for Cargo where they were released on `date`.
date: 2018-12-03 date: 2018-12-06
rustc: 1.31.0 rustc: 1.31.0
cargo: 0.32.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 # looking at a beta source tarball and it's uncommented we'll shortly comment it
# out. # out.
dev: 1 #dev: 1

2
src/tools/cargo

@ -1 +1 @@
Subproject commit 5e85ba14aaa20f8133863373404cb0af69eeef2c Subproject commit 1b6702f22a0dd54847684f29acd6617dd31a8479