Skip to content

Commit 955fcf7

Browse files
committed
Auto merge of rust-lang#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`
2 parents 766bdce + 89afc5c commit 955fcf7

File tree

8 files changed

+18
-15
lines changed

8 files changed

+18
-15
lines changed

compiler/rustc_feature/src/accepted.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ declare_features! (
8585
/// Enables `#[cfg(panic = "...")]` config key.
8686
(accepted, cfg_panic, "1.60.0", Some(77443)),
8787
/// Allows `cfg(target_abi = "...")`.
88-
(accepted, cfg_target_abi, "CURRENT_RUSTC_VERSION", Some(80970)),
88+
(accepted, cfg_target_abi, "1.78.0", Some(80970)),
8989
/// Allows `cfg(target_feature = "...")`.
9090
(accepted, cfg_target_feature, "1.27.0", Some(29717)),
9191
/// Allows `cfg(target_vendor = "...")`.
@@ -147,7 +147,7 @@ declare_features! (
147147
/// Allows the use of destructuring assignments.
148148
(accepted, destructuring_assignment, "1.59.0", Some(71126)),
149149
/// Allows using the `#[diagnostic]` attribute tool namespace
150-
(accepted, diagnostic_namespace, "CURRENT_RUSTC_VERSION", Some(111996)),
150+
(accepted, diagnostic_namespace, "1.78.0", Some(111996)),
151151
/// Allows `#[doc(alias = "...")]`.
152152
(accepted, doc_alias, "1.48.0", Some(50146)),
153153
/// Allows `..` in tuple (struct) patterns.

compiler/rustc_feature/src/removed.rs

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

compiler/rustc_feature/src/unstable.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ declare_features! (
214214
/// Allows using `#[omit_gdb_pretty_printer_section]`.
215215
(internal, omit_gdb_pretty_printer_section, "1.5.0", None),
216216
/// Set the maximum pattern complexity allowed (not limited by default).
217-
(internal, pattern_complexity, "CURRENT_RUSTC_VERSION", None),
217+
(internal, pattern_complexity, "1.78.0", None),
218218
/// Allows using `#[prelude_import]` on glob `use` items.
219219
(internal, prelude_import, "1.2.0", None),
220220
/// Used to identify crates that contain the profiler runtime.
@@ -301,11 +301,11 @@ declare_features! (
301301
(unstable, csky_target_feature, "1.73.0", Some(44839)),
302302
(unstable, ermsb_target_feature, "1.49.0", Some(44839)),
303303
(unstable, hexagon_target_feature, "1.27.0", Some(44839)),
304-
(unstable, lahfsahf_target_feature, "CURRENT_RUSTC_VERSION", Some(44839)),
304+
(unstable, lahfsahf_target_feature, "1.78.0", Some(44839)),
305305
(unstable, loongarch_target_feature, "1.73.0", Some(44839)),
306306
(unstable, mips_target_feature, "1.27.0", Some(44839)),
307307
(unstable, powerpc_target_feature, "1.27.0", Some(44839)),
308-
(unstable, prfchw_target_feature, "CURRENT_RUSTC_VERSION", Some(44839)),
308+
(unstable, prfchw_target_feature, "1.78.0", Some(44839)),
309309
(unstable, riscv_target_feature, "1.45.0", Some(44839)),
310310
(unstable, rtm_target_feature, "1.35.0", Some(44839)),
311311
(unstable, sse4a_target_feature, "1.27.0", Some(44839)),
@@ -346,7 +346,7 @@ declare_features! (
346346
/// Enables experimental inline assembly support for additional architectures.
347347
(unstable, asm_experimental_arch, "1.58.0", Some(93335)),
348348
/// Allows using `label` operands in inline assembly.
349-
(unstable, asm_goto, "CURRENT_RUSTC_VERSION", Some(119364)),
349+
(unstable, asm_goto, "1.78.0", Some(119364)),
350350
/// Allows the `may_unwind` option in inline assembly.
351351
(unstable, asm_unwind, "1.58.0", Some(93334)),
352352
/// Allows users to enforce equality of associated constants `TraitImpl<AssocConst=3>`.
@@ -412,7 +412,7 @@ declare_features! (
412412
/// Allows references to types with interior mutability within constants
413413
(unstable, const_refs_to_cell, "1.51.0", Some(80384)),
414414
/// Allows creating pointers and references to `static` items in constants.
415-
(unstable, const_refs_to_static, "CURRENT_RUSTC_VERSION", Some(119618)),
415+
(unstable, const_refs_to_static, "1.78.0", Some(119618)),
416416
/// Allows `impl const Trait for T` syntax.
417417
(unstable, const_trait_impl, "1.42.0", Some(67792)),
418418
/// Allows the `?` operator in const contexts.
@@ -464,9 +464,9 @@ declare_features! (
464464
/// Allows defining `extern type`s.
465465
(unstable, extern_types, "1.23.0", Some(43467)),
466466
/// Allow using 128-bit (quad precision) floating point numbers.
467-
(unstable, f128, "CURRENT_RUSTC_VERSION", Some(116909)),
467+
(unstable, f128, "1.78.0", Some(116909)),
468468
/// Allow using 16-bit (half precision) floating point numbers.
469-
(unstable, f16, "CURRENT_RUSTC_VERSION", Some(116909)),
469+
(unstable, f16, "1.78.0", Some(116909)),
470470
/// Allows the use of `#[ffi_const]` on foreign functions.
471471
(unstable, ffi_const, "1.45.0", Some(58328)),
472472
/// Allows the use of `#[ffi_pure]` on foreign functions.
@@ -476,7 +476,7 @@ declare_features! (
476476
/// Support delegating implementation of functions to other already implemented functions.
477477
(incomplete, fn_delegation, "1.76.0", Some(118212)),
478478
/// Allows impls for the Freeze trait.
479-
(internal, freeze_impls, "CURRENT_RUSTC_VERSION", Some(121675)),
479+
(internal, freeze_impls, "1.78.0", Some(121675)),
480480
/// Allows defining gen blocks and `gen fn`.
481481
(unstable, gen_blocks, "1.75.0", Some(117078)),
482482
/// Infer generic args for both consts and types.

library/std/src/io/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl From<alloc::ffi::NulError> for Error {
8383
}
8484
}
8585

86-
#[stable(feature = "io_error_from_try_reserve", since = "CURRENT_RUSTC_VERSION")]
86+
#[stable(feature = "io_error_from_try_reserve", since = "1.78.0")]
8787
impl From<alloc::collections::TryReserveError> for Error {
8888
/// Converts `TryReserveError` to an error with [`ErrorKind::OutOfMemory`].
8989
///

library/std/src/io/stdio.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ impl Read for Stdin {
453453
}
454454
}
455455

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

library/std/src/sync/barrier.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl Barrier {
8181
/// let barrier = Barrier::new(10);
8282
/// ```
8383
#[stable(feature = "rust1", since = "1.0.0")]
84-
#[rustc_const_stable(feature = "const_barrier", since = "CURRENT_RUSTC_VERSION")]
84+
#[rustc_const_stable(feature = "const_barrier", since = "1.78.0")]
8585
#[must_use]
8686
#[inline]
8787
pub const fn new(n: usize) -> Barrier {

src/bootstrap/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1387,6 +1387,9 @@ impl Build {
13871387
if let Some(path) = finder.maybe_have("wasmtime") {
13881388
if let Ok(mut path) = path.into_os_string().into_string() {
13891389
path.push_str(" run -C cache=n --dir .");
1390+
// Make sure that tests have access to RUSTC_BOOTSTRAP. This (for example) is
1391+
// required for libtest to work on beta/stable channels.
1392+
path.push_str(" --env RUSTC_BOOTSTRAP");
13901393
return Some(path);
13911394
}
13921395
}

src/ci/channel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly
1+
beta

0 commit comments

Comments
 (0)