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

[beta] branch 1.78

https://forge.rust-lang.org/release/process.html#promote-branches-t-3-days-monday

r? `@Mark-Simulacrum`

Author: bors

compiler/rustc_feature/src/accepted.rs

@@ -85,7 +85,7 @@ declare_features! (
     /// Enables `#[cfg(panic = "...")]` config key.
     (accepted, cfg_panic, "1.60.0", Some(77443)),
     /// Allows `cfg(target_abi = "...")`.
-    (accepted, cfg_target_abi, "CURRENT_RUSTC_VERSION", Some(80970)),
+    (accepted, cfg_target_abi, "1.78.0", Some(80970)),
     /// Allows `cfg(target_feature = "...")`.
     (accepted, cfg_target_feature, "1.27.0", Some(29717)),
     /// Allows `cfg(target_vendor = "...")`.
@@ -147,7 +147,7 @@ declare_features! (
     /// Allows the use of destructuring assignments.
     (accepted, destructuring_assignment, "1.59.0", Some(71126)),
     /// Allows using the `#[diagnostic]` attribute tool namespace
-    (accepted, diagnostic_namespace, "CURRENT_RUSTC_VERSION", Some(111996)),
+    (accepted, diagnostic_namespace, "1.78.0", Some(111996)),
     /// Allows `#[doc(alias = "...")]`.
     (accepted, doc_alias, "1.48.0", Some(50146)),
     /// Allows `..` in tuple (struct) patterns.

compiler/rustc_feature/src/removed.rs

@@ -98,7 +98,7 @@ declare_features! (
     (removed, external_doc, "1.54.0", Some(44732),
      Some("use #[doc = include_str!(\"filename\")] instead, which handles macro invocations")),
     /// Allows using `#[ffi_returns_twice]` on foreign functions.
-    (removed, ffi_returns_twice, "CURRENT_RUSTC_VERSION", Some(58314),
+    (removed, ffi_returns_twice, "1.78.0", Some(58314),
      Some("being investigated by the ffi-unwind project group")),
     /// Allows generators to be cloned.
     (removed, generator_clone, "1.65.0", Some(95360), Some("renamed to `coroutine_clone`")),

compiler/rustc_feature/src/unstable.rs

@@ -214,7 +214,7 @@ declare_features! (
     /// Allows using `#[omit_gdb_pretty_printer_section]`.
     (internal, omit_gdb_pretty_printer_section, "1.5.0", None),
     /// Set the maximum pattern complexity allowed (not limited by default).
-    (internal, pattern_complexity, "CURRENT_RUSTC_VERSION", None),
+    (internal, pattern_complexity, "1.78.0", None),
     /// Allows using `#[prelude_import]` on glob `use` items.
     (internal, prelude_import, "1.2.0", None),
     /// Used to identify crates that contain the profiler runtime.
@@ -301,11 +301,11 @@ declare_features! (
     (unstable, csky_target_feature, "1.73.0", Some(44839)),
     (unstable, ermsb_target_feature, "1.49.0", Some(44839)),
     (unstable, hexagon_target_feature, "1.27.0", Some(44839)),
-    (unstable, lahfsahf_target_feature, "CURRENT_RUSTC_VERSION", Some(44839)),
+    (unstable, lahfsahf_target_feature, "1.78.0", Some(44839)),
     (unstable, loongarch_target_feature, "1.73.0", Some(44839)),
     (unstable, mips_target_feature, "1.27.0", Some(44839)),
     (unstable, powerpc_target_feature, "1.27.0", Some(44839)),
-    (unstable, prfchw_target_feature, "CURRENT_RUSTC_VERSION", Some(44839)),
+    (unstable, prfchw_target_feature, "1.78.0", Some(44839)),
     (unstable, riscv_target_feature, "1.45.0", Some(44839)),
     (unstable, rtm_target_feature, "1.35.0", Some(44839)),
     (unstable, sse4a_target_feature, "1.27.0", Some(44839)),
@@ -346,7 +346,7 @@ declare_features! (
     /// Enables experimental inline assembly support for additional architectures.
     (unstable, asm_experimental_arch, "1.58.0", Some(93335)),
     /// Allows using `label` operands in inline assembly.
-    (unstable, asm_goto, "CURRENT_RUSTC_VERSION", Some(119364)),
+    (unstable, asm_goto, "1.78.0", Some(119364)),
     /// Allows the `may_unwind` option in inline assembly.
     (unstable, asm_unwind, "1.58.0", Some(93334)),
     /// Allows users to enforce equality of associated constants `TraitImpl<AssocConst=3>`.
@@ -412,7 +412,7 @@ declare_features! (
     /// Allows references to types with interior mutability within constants
     (unstable, const_refs_to_cell, "1.51.0", Some(80384)),
     /// Allows creating pointers and references to `static` items in constants.
-    (unstable, const_refs_to_static, "CURRENT_RUSTC_VERSION", Some(119618)),
+    (unstable, const_refs_to_static, "1.78.0", Some(119618)),
     /// Allows `impl const Trait for T` syntax.
     (unstable, const_trait_impl, "1.42.0", Some(67792)),
     /// Allows the `?` operator in const contexts.
@@ -464,9 +464,9 @@ declare_features! (
     /// Allows defining `extern type`s.
     (unstable, extern_types, "1.23.0", Some(43467)),
     /// Allow using 128-bit (quad precision) floating point numbers.
-    (unstable, f128, "CURRENT_RUSTC_VERSION", Some(116909)),
+    (unstable, f128, "1.78.0", Some(116909)),
     /// Allow using 16-bit (half precision) floating point numbers.
-    (unstable, f16, "CURRENT_RUSTC_VERSION", Some(116909)),
+    (unstable, f16, "1.78.0", Some(116909)),
     /// Allows the use of `#[ffi_const]` on foreign functions.
     (unstable, ffi_const, "1.45.0", Some(58328)),
     /// Allows the use of `#[ffi_pure]` on foreign functions.
@@ -476,7 +476,7 @@ declare_features! (
     /// Support delegating implementation of functions to other already implemented functions.
     (incomplete, fn_delegation, "1.76.0", Some(118212)),
     /// Allows impls for the Freeze trait.
-    (internal, freeze_impls, "CURRENT_RUSTC_VERSION", Some(121675)),
+    (internal, freeze_impls, "1.78.0", Some(121675)),
     /// Allows defining gen blocks and `gen fn`.
     (unstable, gen_blocks, "1.75.0", Some(117078)),
     /// Infer generic args for both consts and types.

library/std/src/io/error.rs

@@ -83,7 +83,7 @@ impl From<alloc::ffi::NulError> for Error {
     }
 }
 
-#[stable(feature = "io_error_from_try_reserve", since = "CURRENT_RUSTC_VERSION")]
+#[stable(feature = "io_error_from_try_reserve", since = "1.78.0")]
 impl From<alloc::collections::TryReserveError> for Error {
     /// Converts `TryReserveError` to an error with [`ErrorKind::OutOfMemory`].
     ///

library/std/src/io/stdio.rs

@@ -453,7 +453,7 @@ impl Read for Stdin {
     }
 }
 
-#[stable(feature = "read_shared_stdin", since = "CURRENT_RUSTC_VERSION")]
+#[stable(feature = "read_shared_stdin", since = "1.78.0")]
 impl Read for &Stdin {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         self.lock().read(buf)

library/std/src/sync/barrier.rs

@@ -81,7 +81,7 @@ impl Barrier {
     /// let barrier = Barrier::new(10);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[rustc_const_stable(feature = "const_barrier", since = "CURRENT_RUSTC_VERSION")]
+    #[rustc_const_stable(feature = "const_barrier", since = "1.78.0")]
     #[must_use]
     #[inline]
     pub const fn new(n: usize) -> Barrier {

src/bootstrap/src/lib.rs

@@ -1387,6 +1387,9 @@ impl Build {
         if let Some(path) = finder.maybe_have("wasmtime") {
             if let Ok(mut path) = path.into_os_string().into_string() {
                 path.push_str(" run -C cache=n --dir .");
+                // Make sure that tests have access to RUSTC_BOOTSTRAP. This (for example) is
+                // required for libtest to work on beta/stable channels.
+                path.push_str(" --env RUSTC_BOOTSTRAP");
                 return Some(path);
             }
         }

src/ci/channel

@@ -1 +1 @@
-nightly
+beta

tests/ui/feature-gates/test-listing-format-json.rs

@@ -5,6 +5,7 @@
 //@ check-run-results
 //@ ignore-nightly
 //@ unset-exec-env:RUSTC_BOOTSTRAP
+//@ ignore-wasi cannot unset RUSTC_BOOTSTRAP
 
 #![cfg(test)]
 #[test]