Skip to content

Commit b4297a5

Browse files
committed
Auto merge of #133447 - BoxyUwU:beta, r=BoxyUwU
[beta] Prepare Rust 1.84.0 r? `@ghost`
2 parents f1e0752 + b19dfd7 commit b4297a5

File tree

35 files changed

+111
-179
lines changed

35 files changed

+111
-179
lines changed

compiler/rustc_feature/src/accepted.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ declare_features! (
225225
/// Allows the use of `if let` expressions.
226226
(accepted, if_let, "1.0.0", None),
227227
/// Rescoping temporaries in `if let` to align with Rust 2024.
228-
(accepted, if_let_rescope, "CURRENT_RUSTC_VERSION", Some(124085)),
228+
(accepted, if_let_rescope, "1.84.0", Some(124085)),
229229
/// Allows top level or-patterns (`p | q`) in `if let` and `while let`.
230230
(accepted, if_while_or_patterns, "1.33.0", Some(48215)),
231231
/// Allows lifetime elision in `impl` headers. For example:
@@ -357,7 +357,7 @@ declare_features! (
357357
(accepted, repr_transparent, "1.28.0", Some(43036)),
358358
/// Allows enums like Result<T, E> to be used across FFI, if T's niche value can
359359
/// be used to describe E or vice-versa.
360-
(accepted, result_ffi_guarantees, "CURRENT_RUSTC_VERSION", Some(110503)),
360+
(accepted, result_ffi_guarantees, "1.84.0", Some(110503)),
361361
/// Allows return-position `impl Trait` in traits.
362362
(accepted, return_position_impl_trait_in_trait, "1.75.0", Some(91611)),
363363
/// Allows code like `let x: &'static u32 = &42` to work (RFC 1414).
@@ -367,7 +367,7 @@ declare_features! (
367367
/// Allows `Self` struct constructor (RFC 2302).
368368
(accepted, self_struct_ctor, "1.32.0", Some(51994)),
369369
/// Shortern the tail expression lifetime
370-
(accepted, shorter_tail_lifetimes, "CURRENT_RUSTC_VERSION", Some(123739)),
370+
(accepted, shorter_tail_lifetimes, "1.84.0", Some(123739)),
371371
/// Allows using subslice patterns, `[a, .., b]` and `[a, xs @ .., b]`.
372372
(accepted, slice_patterns, "1.42.0", Some(62254)),
373373
/// Allows use of `&foo[a..b]` as a slicing syntax.

compiler/rustc_feature/src/removed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ declare_features! (
101101
/// Allows using `#[unsafe_destructor_blind_to_params]` (RFC 1238).
102102
(removed, dropck_parametricity, "1.38.0", Some(28498), None),
103103
/// Uses generic effect parameters for ~const bounds
104-
(removed, effects, "CURRENT_RUSTC_VERSION", Some(102090),
104+
(removed, effects, "1.84.0", Some(102090),
105105
Some("removed, redundant with `#![feature(const_trait_impl)]`")),
106106
/// Allows defining `existential type`s.
107107
(removed, existential_type, "1.38.0", Some(63063),

compiler/rustc_feature/src/unstable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ declare_features! (
338338
(unstable, riscv_target_feature, "1.45.0", Some(44839)),
339339
(unstable, rtm_target_feature, "1.35.0", Some(44839)),
340340
(unstable, s390x_target_feature, "1.82.0", Some(44839)),
341-
(unstable, sparc_target_feature, "CURRENT_RUSTC_VERSION", Some(132783)),
341+
(unstable, sparc_target_feature, "1.84.0", Some(132783)),
342342
(unstable, sse4a_target_feature, "1.27.0", Some(44839)),
343343
(unstable, tbm_target_feature, "1.27.0", Some(44839)),
344344
(unstable, wasm_target_feature, "1.30.0", Some(44839)),
@@ -532,7 +532,7 @@ declare_features! (
532532
/// Allows `#[marker]` on certain traits allowing overlapping implementations.
533533
(unstable, marker_trait_attr, "1.30.0", Some(29864)),
534534
/// Enables the generic const args MVP (only bare paths, not arbitrary computation).
535-
(incomplete, min_generic_const_args, "CURRENT_RUSTC_VERSION", Some(132980)),
535+
(incomplete, min_generic_const_args, "1.84.0", Some(132980)),
536536
/// A minimal, sound subset of specialization intended to be used by the
537537
/// standard library until the soundness issues with specialization
538538
/// are fixed.

library/alloc/src/boxed/convert.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl<T: Clone> From<&[T]> for Box<[T]> {
110110
}
111111

112112
#[cfg(not(no_global_oom_handling))]
113-
#[stable(feature = "box_from_mut_slice", since = "CURRENT_RUSTC_VERSION")]
113+
#[stable(feature = "box_from_mut_slice", since = "1.84.0")]
114114
impl<T: Clone> From<&mut [T]> for Box<[T]> {
115115
/// Converts a `&mut [T]` into a `Box<[T]>`
116116
///
@@ -171,7 +171,7 @@ impl From<&str> for Box<str> {
171171
}
172172

173173
#[cfg(not(no_global_oom_handling))]
174-
#[stable(feature = "box_from_mut_slice", since = "CURRENT_RUSTC_VERSION")]
174+
#[stable(feature = "box_from_mut_slice", since = "1.84.0")]
175175
impl From<&mut str> for Box<str> {
176176
/// Converts a `&mut str` into a `Box<str>`
177177
///

library/alloc/src/ffi/c_str.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ impl From<&CStr> for Box<CStr> {
773773
}
774774

775775
#[cfg(not(test))]
776-
#[stable(feature = "box_from_mut_slice", since = "CURRENT_RUSTC_VERSION")]
776+
#[stable(feature = "box_from_mut_slice", since = "1.84.0")]
777777
impl From<&mut CStr> for Box<CStr> {
778778
/// Converts a `&mut CStr` into a `Box<CStr>`,
779779
/// by copying the contents into a newly allocated [`Box`].
@@ -921,7 +921,7 @@ impl From<&CStr> for Arc<CStr> {
921921
}
922922

923923
#[cfg(target_has_atomic = "ptr")]
924-
#[stable(feature = "shared_from_mut_slice", since = "CURRENT_RUSTC_VERSION")]
924+
#[stable(feature = "shared_from_mut_slice", since = "1.84.0")]
925925
impl From<&mut CStr> for Arc<CStr> {
926926
/// Converts a `&mut CStr` into a `Arc<CStr>`,
927927
/// by copying the contents into a newly allocated [`Arc`].
@@ -953,7 +953,7 @@ impl From<&CStr> for Rc<CStr> {
953953
}
954954
}
955955

956-
#[stable(feature = "shared_from_mut_slice", since = "CURRENT_RUSTC_VERSION")]
956+
#[stable(feature = "shared_from_mut_slice", since = "1.84.0")]
957957
impl From<&mut CStr> for Rc<CStr> {
958958
/// Converts a `&mut CStr` into a `Rc<CStr>`,
959959
/// by copying the contents into a newly allocated [`Rc`].

library/alloc/src/rc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2659,7 +2659,7 @@ impl<T: Clone> From<&[T]> for Rc<[T]> {
26592659
}
26602660

26612661
#[cfg(not(no_global_oom_handling))]
2662-
#[stable(feature = "shared_from_mut_slice", since = "CURRENT_RUSTC_VERSION")]
2662+
#[stable(feature = "shared_from_mut_slice", since = "1.84.0")]
26632663
impl<T: Clone> From<&mut [T]> for Rc<[T]> {
26642664
/// Allocates a reference-counted slice and fills it by cloning `v`'s items.
26652665
///
@@ -2698,7 +2698,7 @@ impl From<&str> for Rc<str> {
26982698
}
26992699

27002700
#[cfg(not(no_global_oom_handling))]
2701-
#[stable(feature = "shared_from_mut_slice", since = "CURRENT_RUSTC_VERSION")]
2701+
#[stable(feature = "shared_from_mut_slice", since = "1.84.0")]
27022702
impl From<&mut str> for Rc<str> {
27032703
/// Allocates a reference-counted string slice and copies `v` into it.
27042704
///

library/alloc/src/sync.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3618,7 +3618,7 @@ impl<T: Clone> From<&[T]> for Arc<[T]> {
36183618
}
36193619

36203620
#[cfg(not(no_global_oom_handling))]
3621-
#[stable(feature = "shared_from_mut_slice", since = "CURRENT_RUSTC_VERSION")]
3621+
#[stable(feature = "shared_from_mut_slice", since = "1.84.0")]
36223622
impl<T: Clone> From<&mut [T]> for Arc<[T]> {
36233623
/// Allocates a reference-counted slice and fills it by cloning `v`'s items.
36243624
///
@@ -3657,7 +3657,7 @@ impl From<&str> for Arc<str> {
36573657
}
36583658

36593659
#[cfg(not(no_global_oom_handling))]
3660-
#[stable(feature = "shared_from_mut_slice", since = "CURRENT_RUSTC_VERSION")]
3660+
#[stable(feature = "shared_from_mut_slice", since = "1.84.0")]
36613661
impl From<&mut str> for Arc<str> {
36623662
/// Allocates a reference-counted `str` and copies `v` into it.
36633663
///

library/core/src/cell.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,8 +2133,8 @@ impl<T: ?Sized> UnsafeCell<T> {
21332133
/// assert_eq!(*uc.get_mut(), 41);
21342134
/// ```
21352135
#[inline(always)]
2136-
#[stable(feature = "unsafe_cell_from_mut", since = "CURRENT_RUSTC_VERSION")]
2137-
#[rustc_const_stable(feature = "unsafe_cell_from_mut", since = "CURRENT_RUSTC_VERSION")]
2136+
#[stable(feature = "unsafe_cell_from_mut", since = "1.84.0")]
2137+
#[rustc_const_stable(feature = "unsafe_cell_from_mut", since = "1.84.0")]
21382138
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_mut_refs))]
21392139
pub const fn from_mut(value: &mut T) -> &mut UnsafeCell<T> {
21402140
// SAFETY: `UnsafeCell<T>` has the same memory layout as `T` due to #[repr(transparent)].

library/core/src/char/methods.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ impl char {
729729
/// '𝕊'.encode_utf16(&mut b);
730730
/// ```
731731
#[stable(feature = "unicode_encode_char", since = "1.15.0")]
732-
#[rustc_const_stable(feature = "const_char_encode_utf16", since = "CURRENT_RUSTC_VERSION")]
732+
#[rustc_const_stable(feature = "const_char_encode_utf16", since = "1.84.0")]
733733
#[inline]
734734
pub const fn encode_utf16(self, dst: &mut [u16]) -> &mut [u16] {
735735
encode_utf16_raw(self as u32, dst)
@@ -1299,7 +1299,7 @@ impl char {
12991299
///
13001300
/// [`to_ascii_uppercase()`]: #method.to_ascii_uppercase
13011301
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
1302-
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
1302+
#[rustc_const_stable(feature = "const_make_ascii", since = "1.84.0")]
13031303
#[inline]
13041304
pub const fn make_ascii_uppercase(&mut self) {
13051305
*self = self.to_ascii_uppercase();
@@ -1325,7 +1325,7 @@ impl char {
13251325
///
13261326
/// [`to_ascii_lowercase()`]: #method.to_ascii_lowercase
13271327
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
1328-
#[rustc_const_stable(feature = "const_make_ascii", since = "CURRENT_RUSTC_VERSION")]
1328+
#[rustc_const_stable(feature = "const_make_ascii", since = "1.84.0")]
13291329
#[inline]
13301330
pub const fn make_ascii_lowercase(&mut self) {
13311331
*self = self.to_ascii_lowercase();
@@ -1838,7 +1838,7 @@ pub const fn encode_utf8_raw(code: u32, dst: &mut [u8]) -> &mut [u8] {
18381838
#[unstable(feature = "char_internals", reason = "exposed only for libstd", issue = "none")]
18391839
#[cfg_attr(
18401840
bootstrap,
1841-
rustc_const_stable(feature = "const_char_encode_utf16", since = "CURRENT_RUSTC_VERSION")
1841+
rustc_const_stable(feature = "const_char_encode_utf16", since = "1.84.0")
18421842
)]
18431843
#[doc(hidden)]
18441844
#[inline]

library/core/src/fmt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ impl<'a> Arguments<'a> {
438438
/// assert_eq!(format_args!("{:?}", std::env::current_dir()).as_str(), None);
439439
/// ```
440440
#[stable(feature = "fmt_as_str", since = "1.52.0")]
441-
#[rustc_const_stable(feature = "const_arguments_as_str", since = "CURRENT_RUSTC_VERSION")]
441+
#[rustc_const_stable(feature = "const_arguments_as_str", since = "1.84.0")]
442442
#[must_use]
443443
#[inline]
444444
pub const fn as_str(&self) -> Option<&'static str> {

0 commit comments

Comments
 (0)