Skip to content

Commit 788da80

Browse files
borsbors
committed
Auto merge of #144898 - BoxyUwU:beta, r=BoxyUwU
[beta] Prepare Rust 1.90.0 r? `@ghost`
2 parents 6d091b2 + cc1a3b0 commit 788da80

File tree

9 files changed

+35
-35
lines changed

9 files changed

+35
-35
lines changed

‎compiler/rustc_feature/src/removed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ declare_features! (
5454

5555
/// Allows using the `amdgpu-kernel` ABI.
5656
(removed, abi_amdgpu_kernel, "1.77.0", Some(51575), None, 120495),
57-
(removed, abi_c_cmse_nonsecure_call, "CURRENT_RUSTC_VERSION", Some(81391), Some("renamed to abi_cmse_nonsecure_call"), 142146),
57+
(removed, abi_c_cmse_nonsecure_call, "1.90.0", Some(81391), Some("renamed to abi_cmse_nonsecure_call"), 142146),
5858
(removed, advanced_slice_patterns, "1.42.0", Some(62254),
5959
Some("merged into `#![feature(slice_patterns)]`"), 67712),
6060
(removed, allocator, "1.0.0", None, None),
@@ -298,7 +298,7 @@ declare_features! (
298298
// FIXME(#141617): we should have a better way to track removed library features, but we reuse
299299
// the infrastructure here so users still get hints. The symbols used here can be remove from
300300
// `symbol.rs` when that happens.
301-
(removed, concat_idents, "CURRENT_RUSTC_VERSION", Some(29599),
301+
(removed, concat_idents, "1.90.0", Some(29599),
302302
Some("use the `${concat(..)}` metavariable expression instead"), 142704),
303303
// -------------------------------------------------------------------------
304304
// feature-group-end: removed library features

‎compiler/rustc_feature/src/unstable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ declare_features! (
354354
/// Allows `extern "avr-interrupt" fn()` and `extern "avr-non-blocking-interrupt" fn()`.
355355
(unstable, abi_avr_interrupt, "1.45.0", Some(69664)),
356356
/// Allows `extern "cmse-nonsecure-call" fn()`.
357-
(unstable, abi_cmse_nonsecure_call, "CURRENT_RUSTC_VERSION", Some(81391)),
357+
(unstable, abi_cmse_nonsecure_call, "1.90.0", Some(81391)),
358358
/// Allows `extern "custom" fn()`.
359359
(unstable, abi_custom, "1.89.0", Some(140829)),
360360
/// Allows `extern "gpu-kernel" fn()`.
@@ -554,7 +554,7 @@ declare_features! (
554554
/// to pass custom arguments to the linker.
555555
(unstable, link_arg_attribute, "1.76.0", Some(99427)),
556556
/// Allows fused `loop`/`match` for direct intraprocedural jumps.
557-
(incomplete, loop_match, "CURRENT_RUSTC_VERSION", Some(132306)),
557+
(incomplete, loop_match, "1.90.0", Some(132306)),
558558
/// Give access to additional metadata about declarative macro meta-variables.
559559
(unstable, macro_metavar_expr, "1.61.0", Some(83527)),
560560
/// Provides a way to concatenate identifiers using metavariable expressions.

‎library/alloc/src/ffi/c_str.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ impl From<&CStr> for CString {
10991099
}
11001100
}
11011101

1102-
#[stable(feature = "c_string_eq_c_str", since = "CURRENT_RUSTC_VERSION")]
1102+
#[stable(feature = "c_string_eq_c_str", since = "1.90.0")]
11031103
impl PartialEq<CStr> for CString {
11041104
#[inline]
11051105
fn eq(&self, other: &CStr) -> bool {
@@ -1112,7 +1112,7 @@ impl PartialEq<CStr> for CString {
11121112
}
11131113
}
11141114

1115-
#[stable(feature = "c_string_eq_c_str", since = "CURRENT_RUSTC_VERSION")]
1115+
#[stable(feature = "c_string_eq_c_str", since = "1.90.0")]
11161116
impl PartialEq<&CStr> for CString {
11171117
#[inline]
11181118
fn eq(&self, other: &&CStr) -> bool {
@@ -1126,7 +1126,7 @@ impl PartialEq<&CStr> for CString {
11261126
}
11271127

11281128
#[cfg(not(no_global_oom_handling))]
1129-
#[stable(feature = "c_string_eq_c_str", since = "CURRENT_RUSTC_VERSION")]
1129+
#[stable(feature = "c_string_eq_c_str", since = "1.90.0")]
11301130
impl PartialEq<Cow<'_, CStr>> for CString {
11311131
#[inline]
11321132
fn eq(&self, other: &Cow<'_, CStr>) -> bool {
@@ -1221,7 +1221,7 @@ impl CStr {
12211221
}
12221222
}
12231223

1224-
#[stable(feature = "c_string_eq_c_str", since = "CURRENT_RUSTC_VERSION")]
1224+
#[stable(feature = "c_string_eq_c_str", since = "1.90.0")]
12251225
impl PartialEq<CString> for CStr {
12261226
#[inline]
12271227
fn eq(&self, other: &CString) -> bool {
@@ -1235,7 +1235,7 @@ impl PartialEq<CString> for CStr {
12351235
}
12361236

12371237
#[cfg(not(no_global_oom_handling))]
1238-
#[stable(feature = "c_string_eq_c_str", since = "CURRENT_RUSTC_VERSION")]
1238+
#[stable(feature = "c_string_eq_c_str", since = "1.90.0")]
12391239
impl PartialEq<Cow<'_, Self>> for CStr {
12401240
#[inline]
12411241
fn eq(&self, other: &Cow<'_, Self>) -> bool {
@@ -1249,7 +1249,7 @@ impl PartialEq<Cow<'_, Self>> for CStr {
12491249
}
12501250

12511251
#[cfg(not(no_global_oom_handling))]
1252-
#[stable(feature = "c_string_eq_c_str", since = "CURRENT_RUSTC_VERSION")]
1252+
#[stable(feature = "c_string_eq_c_str", since = "1.90.0")]
12531253
impl PartialEq<CStr> for Cow<'_, CStr> {
12541254
#[inline]
12551255
fn eq(&self, other: &CStr) -> bool {
@@ -1263,7 +1263,7 @@ impl PartialEq<CStr> for Cow<'_, CStr> {
12631263
}
12641264

12651265
#[cfg(not(no_global_oom_handling))]
1266-
#[stable(feature = "c_string_eq_c_str", since = "CURRENT_RUSTC_VERSION")]
1266+
#[stable(feature = "c_string_eq_c_str", since = "1.90.0")]
12671267
impl PartialEq<&CStr> for Cow<'_, CStr> {
12681268
#[inline]
12691269
fn eq(&self, other: &&CStr) -> bool {
@@ -1277,7 +1277,7 @@ impl PartialEq<&CStr> for Cow<'_, CStr> {
12771277
}
12781278

12791279
#[cfg(not(no_global_oom_handling))]
1280-
#[stable(feature = "c_string_eq_c_str", since = "CURRENT_RUSTC_VERSION")]
1280+
#[stable(feature = "c_string_eq_c_str", since = "1.90.0")]
12811281
impl PartialEq<CString> for Cow<'_, CStr> {
12821282
#[inline]
12831283
fn eq(&self, other: &CString) -> bool {

‎library/core/src/ffi/c_str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ impl CStr {
652652
}
653653
}
654654

655-
#[stable(feature = "c_string_eq_c_str", since = "CURRENT_RUSTC_VERSION")]
655+
#[stable(feature = "c_string_eq_c_str", since = "1.90.0")]
656656
impl PartialEq<&Self> for CStr {
657657
#[inline]
658658
fn eq(&self, other: &&Self) -> bool {

‎library/core/src/num/uint_macros.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -790,8 +790,8 @@ macro_rules! uint_impl {
790790
#[doc = concat!("assert_eq!(1", stringify!($SelfT), ".checked_sub_signed(-2), Some(3));")]
791791
#[doc = concat!("assert_eq!((", stringify!($SelfT), "::MAX - 2).checked_sub_signed(-4), None);")]
792792
/// ```
793-
#[stable(feature = "mixed_integer_ops_unsigned_sub", since = "CURRENT_RUSTC_VERSION")]
794-
#[rustc_const_stable(feature = "mixed_integer_ops_unsigned_sub", since = "CURRENT_RUSTC_VERSION")]
793+
#[stable(feature = "mixed_integer_ops_unsigned_sub", since = "1.90.0")]
794+
#[rustc_const_stable(feature = "mixed_integer_ops_unsigned_sub", since = "1.90.0")]
795795
#[must_use = "this returns the result of the operation, \
796796
without modifying the original"]
797797
#[inline]
@@ -1974,8 +1974,8 @@ macro_rules! uint_impl {
19741974
#[doc = concat!("assert_eq!(1", stringify!($SelfT), ".saturating_sub_signed(-2), 3);")]
19751975
#[doc = concat!("assert_eq!((", stringify!($SelfT), "::MAX - 2).saturating_sub_signed(-4), ", stringify!($SelfT), "::MAX);")]
19761976
/// ```
1977-
#[stable(feature = "mixed_integer_ops_unsigned_sub", since = "CURRENT_RUSTC_VERSION")]
1978-
#[rustc_const_stable(feature = "mixed_integer_ops_unsigned_sub", since = "CURRENT_RUSTC_VERSION")]
1977+
#[stable(feature = "mixed_integer_ops_unsigned_sub", since = "1.90.0")]
1978+
#[rustc_const_stable(feature = "mixed_integer_ops_unsigned_sub", since = "1.90.0")]
19791979
#[must_use = "this returns the result of the operation, \
19801980
without modifying the original"]
19811981
#[inline]
@@ -2122,8 +2122,8 @@ macro_rules! uint_impl {
21222122
#[doc = concat!("assert_eq!(1", stringify!($SelfT), ".wrapping_sub_signed(-2), 3);")]
21232123
#[doc = concat!("assert_eq!((", stringify!($SelfT), "::MAX - 2).wrapping_sub_signed(-4), 1);")]
21242124
/// ```
2125-
#[stable(feature = "mixed_integer_ops_unsigned_sub", since = "CURRENT_RUSTC_VERSION")]
2126-
#[rustc_const_stable(feature = "mixed_integer_ops_unsigned_sub", since = "CURRENT_RUSTC_VERSION")]
2125+
#[stable(feature = "mixed_integer_ops_unsigned_sub", since = "1.90.0")]
2126+
#[rustc_const_stable(feature = "mixed_integer_ops_unsigned_sub", since = "1.90.0")]
21272127
#[must_use = "this returns the result of the operation, \
21282128
without modifying the original"]
21292129
#[inline]
@@ -2581,8 +2581,8 @@ macro_rules! uint_impl {
25812581
#[doc = concat!("assert_eq!(1", stringify!($SelfT), ".overflowing_sub_signed(-2), (3, false));")]
25822582
#[doc = concat!("assert_eq!((", stringify!($SelfT), "::MAX - 2).overflowing_sub_signed(-4), (1, true));")]
25832583
/// ```
2584-
#[stable(feature = "mixed_integer_ops_unsigned_sub", since = "CURRENT_RUSTC_VERSION")]
2585-
#[rustc_const_stable(feature = "mixed_integer_ops_unsigned_sub", since = "CURRENT_RUSTC_VERSION")]
2584+
#[stable(feature = "mixed_integer_ops_unsigned_sub", since = "1.90.0")]
2585+
#[rustc_const_stable(feature = "mixed_integer_ops_unsigned_sub", since = "1.90.0")]
25862586
#[must_use = "this returns the result of the operation, \
25872587
without modifying the original"]
25882588
#[inline]

‎library/core/src/slice/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ impl<T> [T] {
969969
/// assert!(v == [3, 2, 1]);
970970
/// ```
971971
#[stable(feature = "rust1", since = "1.0.0")]
972-
#[rustc_const_stable(feature = "const_slice_reverse", since = "CURRENT_RUSTC_VERSION")]
972+
#[rustc_const_stable(feature = "const_slice_reverse", since = "1.90.0")]
973973
#[inline]
974974
pub const fn reverse(&mut self) {
975975
let half_len = self.len() / 2;

‎library/std/src/num/f32.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl f32 {
4444
#[rustc_allow_incoherent_impl]
4545
#[must_use = "method returns a new number and does not mutate the original value"]
4646
#[stable(feature = "rust1", since = "1.0.0")]
47-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
47+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
4848
#[inline]
4949
pub const fn floor(self) -> f32 {
5050
core::f32::math::floor(self)
@@ -67,7 +67,7 @@ impl f32 {
6767
#[rustc_allow_incoherent_impl]
6868
#[must_use = "method returns a new number and does not mutate the original value"]
6969
#[stable(feature = "rust1", since = "1.0.0")]
70-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
70+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
7171
#[inline]
7272
pub const fn ceil(self) -> f32 {
7373
core::f32::math::ceil(self)
@@ -96,7 +96,7 @@ impl f32 {
9696
#[rustc_allow_incoherent_impl]
9797
#[must_use = "method returns a new number and does not mutate the original value"]
9898
#[stable(feature = "rust1", since = "1.0.0")]
99-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
99+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
100100
#[inline]
101101
pub const fn round(self) -> f32 {
102102
core::f32::math::round(self)
@@ -123,7 +123,7 @@ impl f32 {
123123
#[rustc_allow_incoherent_impl]
124124
#[must_use = "method returns a new number and does not mutate the original value"]
125125
#[stable(feature = "round_ties_even", since = "1.77.0")]
126-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
126+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
127127
#[inline]
128128
pub const fn round_ties_even(self) -> f32 {
129129
core::f32::math::round_ties_even(self)
@@ -149,7 +149,7 @@ impl f32 {
149149
#[rustc_allow_incoherent_impl]
150150
#[must_use = "method returns a new number and does not mutate the original value"]
151151
#[stable(feature = "rust1", since = "1.0.0")]
152-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
152+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
153153
#[inline]
154154
pub const fn trunc(self) -> f32 {
155155
core::f32::math::trunc(self)
@@ -173,7 +173,7 @@ impl f32 {
173173
#[rustc_allow_incoherent_impl]
174174
#[must_use = "method returns a new number and does not mutate the original value"]
175175
#[stable(feature = "rust1", since = "1.0.0")]
176-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
176+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
177177
#[inline]
178178
pub const fn fract(self) -> f32 {
179179
core::f32::math::fract(self)

‎library/std/src/num/f64.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl f64 {
4444
#[rustc_allow_incoherent_impl]
4545
#[must_use = "method returns a new number and does not mutate the original value"]
4646
#[stable(feature = "rust1", since = "1.0.0")]
47-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
47+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
4848
#[inline]
4949
pub const fn floor(self) -> f64 {
5050
core::f64::math::floor(self)
@@ -67,7 +67,7 @@ impl f64 {
6767
#[rustc_allow_incoherent_impl]
6868
#[must_use = "method returns a new number and does not mutate the original value"]
6969
#[stable(feature = "rust1", since = "1.0.0")]
70-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
70+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
7171
#[inline]
7272
pub const fn ceil(self) -> f64 {
7373
core::f64::math::ceil(self)
@@ -96,7 +96,7 @@ impl f64 {
9696
#[rustc_allow_incoherent_impl]
9797
#[must_use = "method returns a new number and does not mutate the original value"]
9898
#[stable(feature = "rust1", since = "1.0.0")]
99-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
99+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
100100
#[inline]
101101
pub const fn round(self) -> f64 {
102102
core::f64::math::round(self)
@@ -123,7 +123,7 @@ impl f64 {
123123
#[rustc_allow_incoherent_impl]
124124
#[must_use = "method returns a new number and does not mutate the original value"]
125125
#[stable(feature = "round_ties_even", since = "1.77.0")]
126-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
126+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
127127
#[inline]
128128
pub const fn round_ties_even(self) -> f64 {
129129
core::f64::math::round_ties_even(self)
@@ -149,7 +149,7 @@ impl f64 {
149149
#[rustc_allow_incoherent_impl]
150150
#[must_use = "method returns a new number and does not mutate the original value"]
151151
#[stable(feature = "rust1", since = "1.0.0")]
152-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
152+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
153153
#[inline]
154154
pub const fn trunc(self) -> f64 {
155155
core::f64::math::trunc(self)
@@ -173,7 +173,7 @@ impl f64 {
173173
#[rustc_allow_incoherent_impl]
174174
#[must_use = "method returns a new number and does not mutate the original value"]
175175
#[stable(feature = "rust1", since = "1.0.0")]
176-
#[rustc_const_stable(feature = "const_float_round_methods", since = "CURRENT_RUSTC_VERSION")]
176+
#[rustc_const_stable(feature = "const_float_round_methods", since = "1.90.0")]
177177
#[inline]
178178
pub const fn fract(self) -> f64 {
179179
core::f64::math::fract(self)

‎src/ci/channel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly
1+
beta

0 commit comments

Comments
 (0)