diff --git a/src/ci/run.sh b/src/ci/run.sh index 73c3a964f5396..29c11cceb15a4 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -43,7 +43,7 @@ fi # # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` # either automatically or manually. -export RUST_RELEASE_CHANNEL=nightly +export RUST_RELEASE_CHANNEL=beta # Always set the release channel for bootstrap; this is normally not important (i.e., only dist # builds would seem to matter) but in practice bootstrap wants to know whether we're targeting diff --git a/src/stage0.txt b/src/stage0.txt index 494944720d9e8..aa55aa6a7e25d 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -12,14 +12,14 @@ # 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: 2019-12-18 -rustc: beta -cargo: beta +date: 2020-01-27 +rustc: 1.41.0 +cargo: 0.42.0 # We use a nightly rustfmt to format the source because it solves some bootstrapping # issues with use of new syntax in this repo. If you're looking at the beta/stable branch, this key should be omitted, # as we don't want to depend on rustfmt from nightly there. -rustfmt: nightly-2019-12-18 +#rustfmt: nightly-2019-12-18 # When making a stable release the process currently looks like: # @@ -39,4 +39,4 @@ rustfmt: nightly-2019-12-18 # 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/rustfmt b/src/tools/rustfmt index 1838235248bbd..9eb4b56468014 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit 1838235248bbde125bbc6c12fb493e1979088bb5 +Subproject commit 9eb4b56468014771e9076559b2f5c865cdcd248f