diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 8215211ea1c9d..ef33eb5944c72 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1461,18 +1461,18 @@ impl Step for Miri { builder.create_dir(&image); // Prepare the image directory - // We expect miri to build, because we've exited this step above if tool - // state for miri isn't testing. + // We're always fine with miri not building, we don't ship it on + // beta/stable anyway. let miri = builder .ensure(tool::Miri { compiler, target, extra_features: Vec::new() }) .or_else(|| { - missing_tool("miri", builder.build.config.missing_tools); + missing_tool("miri", true); None })?; let cargomiri = builder .ensure(tool::CargoMiri { compiler, target, extra_features: Vec::new() }) .or_else(|| { - missing_tool("cargo miri", builder.build.config.missing_tools); + missing_tool("cargo miri", true); None })?; 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 4d9a91e38b33c..920b0e3bef1c6 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-03-12 -rustc: beta -cargo: beta +date: 2020-04-21 +rustc: 1.43.0 +cargo: 0.44.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 diff --git a/src/tools/rustfmt b/src/tools/rustfmt index a5cb5d26833cf..e417356684a36 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit a5cb5d26833cfda6fa2ed35735448953f728bd5e +Subproject commit e417356684a36ae9c8c4014e8f0cd86650e40dd2