Skip to content

Commit ad726b5

Browse files
committed
Auto merge of #153314 - cuviper:beta-next, r=cuviper
[beta] prepare Rust 1.95.0-beta Ref: https://forge.rust-lang.org/release/process.html#beta-pr - Replace version placeholders with 1.95.0 - Bump to beta release - library/test: always enable unstable features for miri #153369 r? cuviper
2 parents 67aec36 + 752b663 commit ad726b5

File tree

28 files changed

+97
-92
lines changed

28 files changed

+97
-92
lines changed

compiler/rustc_feature/src/accepted.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ declare_features! (
103103
/// Enables `#[cfg(panic = "...")]` config key.
104104
(accepted, cfg_panic, "1.60.0", Some(77443)),
105105
/// Provides a native way to easily manage multiple conditional flags without having to rewrite each clause multiple times.
106-
(accepted, cfg_select, "CURRENT_RUSTC_VERSION", Some(115585)),
106+
(accepted, cfg_select, "1.95.0", Some(115585)),
107107
/// Allows `cfg(target_abi = "...")`.
108108
(accepted, cfg_target_abi, "1.78.0", Some(80970)),
109109
/// Allows `cfg(target_feature = "...")`.
@@ -243,7 +243,7 @@ declare_features! (
243243
/// Allows the use of `if let` expressions.
244244
(accepted, if_let, "1.0.0", None),
245245
/// Allows `if let` guard in match arms.
246-
(accepted, if_let_guard, "CURRENT_RUSTC_VERSION", Some(51114)),
246+
(accepted, if_let_guard, "1.95.0", Some(51114)),
247247
/// Rescoping temporaries in `if let` to align with Rust 2024.
248248
(accepted, if_let_rescope, "1.84.0", Some(124085)),
249249
/// Allows top level or-patterns (`p | q`) in `if let` and `while let`.

compiler/rustc_feature/src/removed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ declare_features! (
103103
(removed, default_type_parameter_fallback, "1.82.0", Some(27336),
104104
Some("never properly implemented; requires significant design work"), 127655),
105105
/// Allows using `#[deprecated_safe]` to deprecate the safeness of a function or trait
106-
(removed, deprecated_safe, "CURRENT_RUSTC_VERSION", Some(94978), Some("never properly implemented, in the way of attribute refactor"), 152554),
106+
(removed, deprecated_safe, "1.95.0", Some(94978), Some("never properly implemented, in the way of attribute refactor"), 152554),
107107
/// Allows deriving traits as per `SmartPointer` specification
108108
(removed, derive_smart_pointer, "1.84.0", Some(123430), Some("replaced by `CoercePointee`"), 131284),
109109
/// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
@@ -174,7 +174,7 @@ declare_features! (
174174
Some("removed due to implementation concerns as it requires significant refactorings"), 138492),
175175
/// A temporary feature gate used to enable parser extensions needed
176176
/// to bootstrap fix for #5723.
177-
(removed, issue_5723_bootstrap, "CURRENT_RUSTC_VERSION", None, None),
177+
(removed, issue_5723_bootstrap, "1.95.0", None, None),
178178
/// Lazily evaluate constants. This allows constants to depend on type parameters.
179179
(removed, lazy_normalization_consts, "1.56.0", Some(72219), Some("superseded by `generic_const_exprs`"), 88369),
180180
/// Changes `impl Trait` to capture all lifetimes in scope.

compiler/rustc_feature/src/unstable.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ declare_features! (
368368
/// Allows `async` trait bound modifier.
369369
(unstable, async_trait_bounds, "1.85.0", Some(62290)),
370370
/// Target features on avr.
371-
(unstable, avr_target_feature, "CURRENT_RUSTC_VERSION", Some(146889)),
371+
(unstable, avr_target_feature, "1.95.0", Some(146889)),
372372
/// Allows using Intel AVX10 target features and intrinsics
373373
(unstable, avx10_target_feature, "1.88.0", Some(138843)),
374374
/// Target features on bpf.
@@ -411,9 +411,9 @@ declare_features! (
411411
/// Allows `async {}` expressions in const contexts.
412412
(unstable, const_async_blocks, "1.53.0", Some(85368)),
413413
/// Allows `const { ... }` as a shorthand for `const _: () = const { ... };` for module items.
414-
(unstable, const_block_items, "CURRENT_RUSTC_VERSION", Some(149226)),
414+
(unstable, const_block_items, "1.95.0", Some(149226)),
415415
/// Allows defining and calling c-variadic functions in const contexts.
416-
(unstable, const_c_variadic, "CURRENT_RUSTC_VERSION", Some(151787)),
416+
(unstable, const_c_variadic, "1.95.0", Some(151787)),
417417
/// Allows `const || {}` closures in const contexts.
418418
(incomplete, const_closures, "1.68.0", Some(106003)),
419419
/// Allows using `[const] Destruct` bounds and calling drop impls in const contexts.
@@ -487,7 +487,7 @@ declare_features! (
487487
/// Allows the use of `#[ffi_pure]` on foreign functions.
488488
(unstable, ffi_pure, "1.45.0", Some(58329)),
489489
/// Allows marking trait functions as `final` to prevent overriding impls
490-
(unstable, final_associated_functions, "CURRENT_RUSTC_VERSION", Some(131179)),
490+
(unstable, final_associated_functions, "1.95.0", Some(131179)),
491491
/// Controlling the behavior of fmt::Debug
492492
(unstable, fmt_debug, "1.82.0", Some(129709)),
493493
/// Allows using `#[align(...)]` on function items
@@ -554,7 +554,7 @@ declare_features! (
554554
/// Allows `#[marker]` on certain traits allowing overlapping implementations.
555555
(unstable, marker_trait_attr, "1.30.0", Some(29864)),
556556
/// Enable mgca `type const` syntax before expansion.
557-
(incomplete, mgca_type_const_syntax, "CURRENT_RUSTC_VERSION", Some(132980)),
557+
(incomplete, mgca_type_const_syntax, "1.95.0", Some(132980)),
558558
/// Enables the generic const args MVP (only bare paths, not arbitrary computation).
559559
(incomplete, min_generic_const_args, "1.84.0", Some(132980)),
560560
/// A minimal, sound subset of specialization intended to be used by the
@@ -600,7 +600,7 @@ declare_features! (
600600
/// Allows using fields with slice type in offset_of!
601601
(unstable, offset_of_slice, "1.81.0", Some(126151)),
602602
/// Allows using generics in more complex const expressions, based on definitional equality.
603-
(unstable, opaque_generic_const_args, "CURRENT_RUSTC_VERSION", Some(151972)),
603+
(unstable, opaque_generic_const_args, "1.95.0", Some(151972)),
604604
/// Allows using `#[optimize(X)]`.
605605
(unstable, optimize_attribute, "1.34.0", Some(54882)),
606606
/// Allows specifying nop padding on functions for dynamic patching.
@@ -635,7 +635,7 @@ declare_features! (
635635
/// Allows `extern "rust-cold"`.
636636
(unstable, rust_cold_cc, "1.63.0", Some(97544)),
637637
/// Allows `extern "rust-preserve-none"`.
638-
(unstable, rust_preserve_none_cc, "CURRENT_RUSTC_VERSION", Some(151401)),
638+
(unstable, rust_preserve_none_cc, "1.95.0", Some(151401)),
639639
/// Target features on s390x.
640640
(unstable, s390x_target_feature, "1.82.0", Some(150259)),
641641
/// Allows the use of the `sanitize` attribute.

library/alloc/src/collections/linked_list.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ impl<T, A: Allocator> LinkedList<T, A> {
862862
/// *ptr += 4;
863863
/// assert_eq!(dl.front().unwrap(), &6);
864864
/// ```
865-
#[stable(feature = "push_mut", since = "CURRENT_RUSTC_VERSION")]
865+
#[stable(feature = "push_mut", since = "1.95.0")]
866866
#[must_use = "if you don't need a reference to the value, use `LinkedList::push_front` instead"]
867867
pub fn push_front_mut(&mut self, elt: T) -> &mut T {
868868
let mut node =
@@ -933,7 +933,7 @@ impl<T, A: Allocator> LinkedList<T, A> {
933933
/// *ptr += 4;
934934
/// assert_eq!(dl.back().unwrap(), &6);
935935
/// ```
936-
#[stable(feature = "push_mut", since = "CURRENT_RUSTC_VERSION")]
936+
#[stable(feature = "push_mut", since = "1.95.0")]
937937
#[must_use = "if you don't need a reference to the value, use `LinkedList::push_back` instead"]
938938
pub fn push_back_mut(&mut self, elt: T) -> &mut T {
939939
let mut node =

library/alloc/src/collections/vec_deque/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2175,7 +2175,7 @@ impl<T, A: Allocator> VecDeque<T, A> {
21752175
/// *x -= 1;
21762176
/// assert_eq!(d.front(), Some(&7));
21772177
/// ```
2178-
#[stable(feature = "push_mut", since = "CURRENT_RUSTC_VERSION")]
2178+
#[stable(feature = "push_mut", since = "1.95.0")]
21792179
#[must_use = "if you don't need a reference to the value, use `VecDeque::push_front` instead"]
21802180
pub fn push_front_mut(&mut self, value: T) -> &mut T {
21812181
if self.is_full() {
@@ -2218,7 +2218,7 @@ impl<T, A: Allocator> VecDeque<T, A> {
22182218
/// *x += 1;
22192219
/// assert_eq!(d.back(), Some(&10));
22202220
/// ```
2221-
#[stable(feature = "push_mut", since = "CURRENT_RUSTC_VERSION")]
2221+
#[stable(feature = "push_mut", since = "1.95.0")]
22222222
#[must_use = "if you don't need a reference to the value, use `VecDeque::push_back` instead"]
22232223
pub fn push_back_mut(&mut self, value: T) -> &mut T {
22242224
if self.is_full() {
@@ -2425,7 +2425,7 @@ impl<T, A: Allocator> VecDeque<T, A> {
24252425
/// *x += 7;
24262426
/// assert_eq!(vec_deque, &[1, 12, 2, 3]);
24272427
/// ```
2428-
#[stable(feature = "push_mut", since = "CURRENT_RUSTC_VERSION")]
2428+
#[stable(feature = "push_mut", since = "1.95.0")]
24292429
#[must_use = "if you don't need a reference to the value, use `VecDeque::insert` instead"]
24302430
pub fn insert_mut(&mut self, index: usize, value: T) -> &mut T {
24312431
assert!(index <= self.len(), "index out of bounds");

library/alloc/src/vec/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ const impl<T, A: [const] Allocator + [const] Destruct> Vec<T, A> {
10181018
/// vector's elements to a larger allocation. This expensive operation is
10191019
/// offset by the *capacity* *O*(1) insertions it allows.
10201020
#[inline]
1021-
#[stable(feature = "push_mut", since = "CURRENT_RUSTC_VERSION")]
1021+
#[stable(feature = "push_mut", since = "1.95.0")]
10221022
#[must_use = "if you don't need a reference to the value, use `Vec::push` instead"]
10231023
pub fn push_mut(&mut self, value: T) -> &mut T {
10241024
// Inform codegen that the length does not change across grow_one().
@@ -2271,7 +2271,7 @@ impl<T, A: Allocator> Vec<T, A> {
22712271
/// the insertion index is 0.
22722272
#[cfg(not(no_global_oom_handling))]
22732273
#[inline]
2274-
#[stable(feature = "push_mut", since = "CURRENT_RUSTC_VERSION")]
2274+
#[stable(feature = "push_mut", since = "1.95.0")]
22752275
#[track_caller]
22762276
#[must_use = "if you don't need a reference to the value, use `Vec::insert` instead"]
22772277
pub fn insert_mut(&mut self, index: usize, element: T) -> &mut T {

library/core/src/alloc/layout.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ impl Layout {
263263
/// be that of a valid pointer, which means this must not be used
264264
/// as a "not yet initialized" sentinel value.
265265
/// Types that lazily allocate must track initialization by some other means.
266-
#[stable(feature = "alloc_layout_extra", since = "CURRENT_RUSTC_VERSION")]
267-
#[rustc_const_stable(feature = "alloc_layout_extra", since = "CURRENT_RUSTC_VERSION")]
266+
#[stable(feature = "alloc_layout_extra", since = "1.95.0")]
267+
#[rustc_const_stable(feature = "alloc_layout_extra", since = "1.95.0")]
268268
#[must_use]
269269
#[inline]
270270
pub const fn dangling_ptr(&self) -> NonNull<u8> {
@@ -423,8 +423,8 @@ impl Layout {
423423
/// let repeated = padding_needed.repeat(0).unwrap();
424424
/// assert_eq!(repeated, (Layout::from_size_align(0, 4).unwrap(), 8));
425425
/// ```
426-
#[stable(feature = "alloc_layout_extra", since = "CURRENT_RUSTC_VERSION")]
427-
#[rustc_const_stable(feature = "alloc_layout_extra", since = "CURRENT_RUSTC_VERSION")]
426+
#[stable(feature = "alloc_layout_extra", since = "1.95.0")]
427+
#[rustc_const_stable(feature = "alloc_layout_extra", since = "1.95.0")]
428428
#[inline]
429429
pub const fn repeat(&self, n: usize) -> Result<(Self, usize), LayoutError> {
430430
// FIXME(const-hack): the following could be way shorter with `?`
@@ -520,8 +520,8 @@ impl Layout {
520520
/// aligned.
521521
///
522522
/// On arithmetic overflow, returns `LayoutError`.
523-
#[stable(feature = "alloc_layout_extra", since = "CURRENT_RUSTC_VERSION")]
524-
#[rustc_const_stable(feature = "alloc_layout_extra", since = "CURRENT_RUSTC_VERSION")]
523+
#[stable(feature = "alloc_layout_extra", since = "1.95.0")]
524+
#[rustc_const_stable(feature = "alloc_layout_extra", since = "1.95.0")]
525525
#[inline]
526526
pub const fn repeat_packed(&self, n: usize) -> Result<Self, LayoutError> {
527527
if let Some(size) = self.size.checked_mul(n) {
@@ -538,8 +538,8 @@ impl Layout {
538538
/// and is not incorporated *at all* into the resulting layout.
539539
///
540540
/// On arithmetic overflow, returns `LayoutError`.
541-
#[stable(feature = "alloc_layout_extra", since = "CURRENT_RUSTC_VERSION")]
542-
#[rustc_const_stable(feature = "alloc_layout_extra", since = "CURRENT_RUSTC_VERSION")]
541+
#[stable(feature = "alloc_layout_extra", since = "1.95.0")]
542+
#[rustc_const_stable(feature = "alloc_layout_extra", since = "1.95.0")]
543543
#[inline]
544544
pub const fn extend_packed(&self, next: Self) -> Result<Self, LayoutError> {
545545
// SAFETY: each `size` is at most `isize::MAX == usize::MAX/2`, so the

library/core/src/cell.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,23 +689,23 @@ impl<T: CoerceUnsized<U>, U> CoerceUnsized<Cell<U>> for Cell<T> {}
689689
#[unstable(feature = "dispatch_from_dyn", issue = "none")]
690690
impl<T: DispatchFromDyn<U>, U> DispatchFromDyn<Cell<U>> for Cell<T> {}
691691

692-
#[stable(feature = "more_conversion_trait_impls", since = "CURRENT_RUSTC_VERSION")]
692+
#[stable(feature = "more_conversion_trait_impls", since = "1.95.0")]
693693
impl<T, const N: usize> AsRef<[Cell<T>; N]> for Cell<[T; N]> {
694694
#[inline]
695695
fn as_ref(&self) -> &[Cell<T>; N] {
696696
self.as_array_of_cells()
697697
}
698698
}
699699

700-
#[stable(feature = "more_conversion_trait_impls", since = "CURRENT_RUSTC_VERSION")]
700+
#[stable(feature = "more_conversion_trait_impls", since = "1.95.0")]
701701
impl<T, const N: usize> AsRef<[Cell<T>]> for Cell<[T; N]> {
702702
#[inline]
703703
fn as_ref(&self) -> &[Cell<T>] {
704704
&*self.as_array_of_cells()
705705
}
706706
}
707707

708-
#[stable(feature = "more_conversion_trait_impls", since = "CURRENT_RUSTC_VERSION")]
708+
#[stable(feature = "more_conversion_trait_impls", since = "1.95.0")]
709709
impl<T> AsRef<[Cell<T>]> for Cell<[T]> {
710710
#[inline]
711711
fn as_ref(&self) -> &[Cell<T>] {

library/core/src/fmt/builders.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ impl<'a, 'b: 'a> DebugMap<'a, 'b> {
12271227
/// assert_eq!(format!("{:?}", wrapped), "'a'");
12281228
/// ```
12291229
#[stable(feature = "fmt_from_fn", since = "1.93.0")]
1230-
#[rustc_const_stable(feature = "const_fmt_from_fn", since = "CURRENT_RUSTC_VERSION")]
1230+
#[rustc_const_stable(feature = "const_fmt_from_fn", since = "1.95.0")]
12311231
#[must_use = "returns a type implementing Debug and Display, which do not have any effects unless they are used"]
12321232
pub const fn from_fn<F: Fn(&mut fmt::Formatter<'_>) -> fmt::Result>(f: F) -> FromFn<F> {
12331233
FromFn(f)

library/core/src/hint.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,8 +775,8 @@ pub const fn unlikely(b: bool) -> bool {
775775
/// }
776776
/// }
777777
/// ```
778-
#[stable(feature = "cold_path", since = "CURRENT_RUSTC_VERSION")]
779-
#[rustc_const_stable(feature = "cold_path", since = "CURRENT_RUSTC_VERSION")]
778+
#[stable(feature = "cold_path", since = "1.95.0")]
779+
#[rustc_const_stable(feature = "cold_path", since = "1.95.0")]
780780
#[inline(always)]
781781
pub const fn cold_path() {
782782
crate::intrinsics::cold_path()

0 commit comments

Comments
 (0)