From 85faf23dad6cbe9a348d40db0ba73f1086f38359 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Tue, 10 Mar 2020 11:31:16 +0100 Subject: [PATCH 1/2] promote beta 1.43.0 --- src/ci/run.sh | 2 +- src/stage0.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 55416b6729adb..ac7336631abca 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -12,15 +12,15 @@ # 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: 2020-02-29 -rustc: beta -cargo: beta +date: 2020-03-10 +rustc: 1.42.0 +cargo: 0.43.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-2020-01-31 +#rustfmt: nightly-2020-01-31 # When making a stable release the process currently looks like: # @@ -40,4 +40,4 @@ rustfmt: nightly-2020-01-31 # looking at a beta source tarball and it's uncommented we'll shortly comment it # out. -#dev: 1 +dev: 1 From 59a6d31a286911e74e8b99137f30e7a82bf792cb Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Wed, 11 Mar 2020 23:05:55 +0100 Subject: [PATCH 2/2] bump rustfmt to include fix for failing tests --- src/tools/rustfmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rustfmt b/src/tools/rustfmt index 9f53665f91be1..a828ffea992db 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit 9f53665f91be16c9aa7afd83f7c79357fec9152b +Subproject commit a828ffea992db2085aa13822a69acb74fa1bde31