Auto merge of #74323 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum

[beta] 1.46 beta

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

src/libcore/intrinsics.rs

@@ -1287,7 +1287,7 @@ extern "rust-intrinsic" {
     #[stable(feature = "rust1", since = "1.0.0")]
     // NOTE: While this makes the intrinsic const stable, we have some custom code in const fn
     // checks that prevent its use within `const fn`.
-    #[rustc_const_stable(feature = "const_transmute", since = "1.46.0")]
+    #[rustc_const_stable(feature = "const_transmute_in_consts", since = "1.46.0")]
     pub fn transmute<T, U>(e: T) -> U;
 
     /// Returns `true` if the actual type given as `T` requires drop
@@ -2286,3 +2286,7 @@ pub unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize) {
     // SAFETY: the safety contract for `write_bytes` must be upheld by the caller.
     unsafe { write_bytes(dst, val, count) }
 }
+
+// dummy function to unbreak beta builds
+#[rustc_const_unstable(feature = "const_transmute", issue = "53605")]
+const fn _bar() {}

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-06-16
-rustc: beta
-cargo: beta
+date: 2020-07-13
+rustc: 1.45.0
+cargo: 0.46.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