summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-08-24 14:59:38 +0000
committerbors <bors@rust-lang.org>2020-08-24 14:59:38 +0000
commit04488afe34512aa4c33566eb16d8c912a3ae04f9 (patch)
tree7d462ac1856b7eb6651d21bcecefe4f614bf0aad /src
parentcfbc6d4cf1acbac5c025acf8ed68929caa551df3 (diff)
parented6d57b85b2378fefb7f8a2042436960f1f54ba3 (diff)
downloadrust-1.46.0.tar.gz
rust-1.46.0.zip
Auto merge of #75878 - pietroalbini:stable-next, r=Mark-Simulacrum 1.46.0
[stable] Prepare Rust 1.46.0

Also updated the compatibility notes to account for the regressions we didn't fix for this release. The release team evaluated them, and we agreed they're not enough to block the release.

r? @Mark-Simulacrum
cc @rust-lang/release
Diffstat (limited to 'src')
-rwxr-xr-xsrc/ci/run.sh2
-rw-r--r--src/stage0.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index ff737ea869f..f888624596c 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=beta
+export RUST_RELEASE_CHANNEL=stable
 
 # 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 2c87531eb96..1594dc93b0c 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -12,9 +12,9 @@
 # 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-07-13
-rustc: 1.45.0
-cargo: 0.46.0
+date: 2020-08-03
+rustc: 1.45.2
+cargo: 0.46.1
 
 # 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
@@ -40,4 +40,4 @@ cargo: 0.46.0
 # looking at a beta source tarball and it's uncommented we'll shortly comment it
 # out.
 
-dev: 1
+#dev: 1