From d21c8c408c878f035491514b1a10847be51ed3da Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Tue, 2 Jun 2020 11:48:04 -0400 Subject: [PATCH 1/2] [beta] 1.45 promoted --- 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 59f2736cbd406..ff737ea869f2b 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -51,7 +51,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 150d7a0943db0..0778fbab7ea2c 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+1).0` for Cargo where they were released on `date`. -date: 2020-04-22 -rustc: beta -cargo: beta +date: 2020-06-01 +rustc: 1.44.0 +cargo: 0.45.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-04-22 +#rustfmt: nightly-2020-04-22 # When making a stable release the process currently looks like: # @@ -40,4 +40,4 @@ rustfmt: nightly-2020-04-22 # looking at a beta source tarball and it's uncommented we'll shortly comment it # out. -#dev: 1 +dev: 1 From 5afb70a48564118b1e7f738110ce3e22e733dab8 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Tue, 2 Jun 2020 21:05:28 -0400 Subject: [PATCH 2/2] Cherry-pick rustfmt unstable-dependent fixes --- src/tools/rustfmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rustfmt b/src/tools/rustfmt index aedff61f7ac4f..530eadf4b42dd 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit aedff61f7ac4fc2b287ff76d33f2584e1f63a3af +Subproject commit 530eadf4b42ddf35b209d4f4acd120f3fcc467ce