Skip to content

Commit ddff2b6

Browse files
borsbors
committed
Auto merge of rust-lang#128083 - Mark-Simulacrum:bump-bootstrap, r=albertlarsan68
Bump bootstrap compiler to new beta https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday
2 parents 440ec83 + abc611f commit ddff2b6

File tree

27 files changed

+25
-135
lines changed

27 files changed

+25
-135
lines changed

Diff for: ‎alloc/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@
165165
//
166166
// Language features:
167167
// tidy-alphabetical-start
168-
#![cfg_attr(bootstrap, feature(c_unwind))]
169168
#![cfg_attr(not(test), feature(coroutine_trait))]
170169
#![cfg_attr(test, feature(panic_update_hook))]
171170
#![cfg_attr(test, feature(test))]

Diff for: ‎core/src/char/methods.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,7 @@ impl char {
222222
/// assert_eq!('❤', c);
223223
/// ```
224224
#[stable(feature = "assoc_char_funcs", since = "1.52.0")]
225-
#[rustc_const_stable(
226-
feature = "const_char_from_u32_unchecked",
227-
since = "CURRENT_RUSTC_VERSION"
228-
)]
225+
#[rustc_const_stable(feature = "const_char_from_u32_unchecked", since = "1.81.0")]
229226
#[must_use]
230227
#[inline]
231228
pub const unsafe fn from_u32_unchecked(i: u32) -> char {

Diff for: ‎core/src/char/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ pub const fn from_u32(i: u32) -> Option<char> {
125125
/// Converts a `u32` to a `char`, ignoring validity. Use [`char::from_u32_unchecked`].
126126
/// instead.
127127
#[stable(feature = "char_from_unchecked", since = "1.5.0")]
128-
#[rustc_const_stable(feature = "const_char_from_u32_unchecked", since = "CURRENT_RUSTC_VERSION")]
128+
#[rustc_const_stable(feature = "const_char_from_u32_unchecked", since = "1.81.0")]
129129
#[must_use]
130130
#[inline]
131131
pub const unsafe fn from_u32_unchecked(i: u32) -> char {

Diff for: ‎core/src/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![doc = include_str!("error.md")]
2-
#![stable(feature = "error_in_core", since = "CURRENT_RUSTC_VERSION")]
2+
#![stable(feature = "error_in_core", since = "1.81.0")]
33

44
#[cfg(test)]
55
mod tests;

Diff for: ‎core/src/ffi/c_str.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ impl CStr {
272272
#[inline] // inline is necessary for codegen to see strlen.
273273
#[must_use]
274274
#[stable(feature = "rust1", since = "1.0.0")]
275-
#[rustc_const_stable(feature = "const_cstr_from_ptr", since = "CURRENT_RUSTC_VERSION")]
275+
#[rustc_const_stable(feature = "const_cstr_from_ptr", since = "1.81.0")]
276276
pub const unsafe fn from_ptr<'a>(ptr: *const c_char) -> &'a CStr {
277277
// SAFETY: The caller has provided a pointer that points to a valid C
278278
// string with a NUL terminator less than `isize::MAX` from `ptr`.
@@ -534,7 +534,7 @@ impl CStr {
534534
#[must_use]
535535
#[doc(alias("len", "strlen"))]
536536
#[stable(feature = "cstr_count_bytes", since = "1.79.0")]
537-
#[rustc_const_stable(feature = "const_cstr_from_ptr", since = "CURRENT_RUSTC_VERSION")]
537+
#[rustc_const_stable(feature = "const_cstr_from_ptr", since = "1.81.0")]
538538
pub const fn count_bytes(&self) -> usize {
539539
self.inner.len() - 1
540540
}
@@ -729,7 +729,7 @@ impl AsRef<CStr> for CStr {
729729
/// located within `isize::MAX` from `ptr`.
730730
#[inline]
731731
#[unstable(feature = "cstr_internals", issue = "none")]
732-
#[rustc_const_stable(feature = "const_cstr_from_ptr", since = "CURRENT_RUSTC_VERSION")]
732+
#[rustc_const_stable(feature = "const_cstr_from_ptr", since = "1.81.0")]
733733
#[rustc_allow_const_fn_unstable(const_eval_select)]
734734
const unsafe fn strlen(ptr: *const c_char) -> usize {
735735
const fn strlen_ct(s: *const c_char) -> usize {

Diff for: ‎core/src/hint.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ pub const unsafe fn unreachable_unchecked() -> ! {
194194
#[track_caller]
195195
#[inline(always)]
196196
#[doc(alias = "assume")]
197-
#[stable(feature = "hint_assert_unchecked", since = "CURRENT_RUSTC_VERSION")]
198-
#[rustc_const_stable(feature = "hint_assert_unchecked", since = "CURRENT_RUSTC_VERSION")]
197+
#[stable(feature = "hint_assert_unchecked", since = "1.81.0")]
198+
#[rustc_const_stable(feature = "hint_assert_unchecked", since = "1.81.0")]
199199
pub const unsafe fn assert_unchecked(cond: bool) {
200200
// SAFETY: The caller promised `cond` is true.
201201
unsafe {

Diff for: ‎core/src/intrinsics.rs

-53
Original file line numberDiff line numberDiff line change
@@ -1043,45 +1043,6 @@ extern "rust-intrinsic" {
10431043
#[rustc_nounwind]
10441044
pub fn breakpoint();
10451045

1046-
#[cfg(bootstrap)]
1047-
#[rustc_const_stable(feature = "const_size_of", since = "1.40.0")]
1048-
#[rustc_safe_intrinsic]
1049-
#[rustc_nounwind]
1050-
pub fn size_of<T>() -> usize;
1051-
1052-
#[cfg(bootstrap)]
1053-
#[rustc_const_stable(feature = "const_min_align_of", since = "1.40.0")]
1054-
#[rustc_safe_intrinsic]
1055-
#[rustc_nounwind]
1056-
pub fn min_align_of<T>() -> usize;
1057-
1058-
#[cfg(bootstrap)]
1059-
#[rustc_const_unstable(feature = "const_pref_align_of", issue = "91971")]
1060-
#[rustc_nounwind]
1061-
pub fn pref_align_of<T>() -> usize;
1062-
1063-
#[cfg(bootstrap)]
1064-
#[rustc_const_unstable(feature = "const_size_of_val", issue = "46571")]
1065-
#[rustc_nounwind]
1066-
pub fn size_of_val<T: ?Sized>(_: *const T) -> usize;
1067-
1068-
#[cfg(bootstrap)]
1069-
#[rustc_const_unstable(feature = "const_align_of_val", issue = "46571")]
1070-
#[rustc_nounwind]
1071-
pub fn min_align_of_val<T: ?Sized>(_: *const T) -> usize;
1072-
1073-
#[cfg(bootstrap)]
1074-
#[rustc_const_unstable(feature = "const_type_name", issue = "63084")]
1075-
#[rustc_safe_intrinsic]
1076-
#[rustc_nounwind]
1077-
pub fn type_name<T: ?Sized>() -> &'static str;
1078-
1079-
#[cfg(bootstrap)]
1080-
#[rustc_const_unstable(feature = "const_type_id", issue = "77125")]
1081-
#[rustc_safe_intrinsic]
1082-
#[rustc_nounwind]
1083-
pub fn type_id<T: ?Sized + 'static>() -> u128;
1084-
10851046
/// A guard for unsafe functions that cannot ever be executed if `T` is uninhabited:
10861047
/// This will statically either panic, or do nothing.
10871048
///
@@ -2411,12 +2372,6 @@ extern "rust-intrinsic" {
24112372
#[rustc_nounwind]
24122373
pub fn discriminant_value<T>(v: &T) -> <T as DiscriminantKind>::Discriminant;
24132374

2414-
#[cfg(bootstrap)]
2415-
#[rustc_const_unstable(feature = "variant_count", issue = "73662")]
2416-
#[rustc_safe_intrinsic]
2417-
#[rustc_nounwind]
2418-
pub fn variant_count<T>() -> usize;
2419-
24202375
/// Rust's "try catch" construct for unwinding. Invokes the function pointer `try_fn` with the
24212376
/// data pointer `data`, and calls `catch_fn` if unwinding occurs while `try_fn` runs.
24222377
///
@@ -2794,7 +2749,6 @@ pub unsafe fn vtable_align(_ptr: *const ()) -> usize {
27942749
#[rustc_const_stable(feature = "const_size_of", since = "1.40.0")]
27952750
#[rustc_intrinsic]
27962751
#[rustc_intrinsic_must_be_overridden]
2797-
#[cfg(not(bootstrap))]
27982752
pub const fn size_of<T>() -> usize {
27992753
unreachable!()
28002754
}
@@ -2812,7 +2766,6 @@ pub const fn size_of<T>() -> usize {
28122766
#[rustc_const_stable(feature = "const_min_align_of", since = "1.40.0")]
28132767
#[rustc_intrinsic]
28142768
#[rustc_intrinsic_must_be_overridden]
2815-
#[cfg(not(bootstrap))]
28162769
pub const fn min_align_of<T>() -> usize {
28172770
unreachable!()
28182771
}
@@ -2826,7 +2779,6 @@ pub const fn min_align_of<T>() -> usize {
28262779
#[rustc_const_unstable(feature = "const_pref_align_of", issue = "91971")]
28272780
#[rustc_intrinsic]
28282781
#[rustc_intrinsic_must_be_overridden]
2829-
#[cfg(not(bootstrap))]
28302782
pub const unsafe fn pref_align_of<T>() -> usize {
28312783
unreachable!()
28322784
}
@@ -2845,7 +2797,6 @@ pub const unsafe fn pref_align_of<T>() -> usize {
28452797
#[rustc_const_unstable(feature = "variant_count", issue = "73662")]
28462798
#[rustc_intrinsic]
28472799
#[rustc_intrinsic_must_be_overridden]
2848-
#[cfg(not(bootstrap))]
28492800
pub const fn variant_count<T>() -> usize {
28502801
unreachable!()
28512802
}
@@ -2862,7 +2813,6 @@ pub const fn variant_count<T>() -> usize {
28622813
#[rustc_const_unstable(feature = "const_size_of_val", issue = "46571")]
28632814
#[rustc_intrinsic]
28642815
#[rustc_intrinsic_must_be_overridden]
2865-
#[cfg(not(bootstrap))]
28662816
pub const unsafe fn size_of_val<T: ?Sized>(_ptr: *const T) -> usize {
28672817
unreachable!()
28682818
}
@@ -2879,7 +2829,6 @@ pub const unsafe fn size_of_val<T: ?Sized>(_ptr: *const T) -> usize {
28792829
#[rustc_const_unstable(feature = "const_align_of_val", issue = "46571")]
28802830
#[rustc_intrinsic]
28812831
#[rustc_intrinsic_must_be_overridden]
2882-
#[cfg(not(bootstrap))]
28832832
pub const unsafe fn min_align_of_val<T: ?Sized>(_ptr: *const T) -> usize {
28842833
unreachable!()
28852834
}
@@ -2897,7 +2846,6 @@ pub const unsafe fn min_align_of_val<T: ?Sized>(_ptr: *const T) -> usize {
28972846
#[rustc_const_unstable(feature = "const_type_name", issue = "63084")]
28982847
#[rustc_intrinsic]
28992848
#[rustc_intrinsic_must_be_overridden]
2900-
#[cfg(not(bootstrap))]
29012849
pub const fn type_name<T: ?Sized>() -> &'static str {
29022850
unreachable!()
29032851
}
@@ -2917,7 +2865,6 @@ pub const fn type_name<T: ?Sized>() -> &'static str {
29172865
#[rustc_const_unstable(feature = "const_type_id", issue = "77125")]
29182866
#[rustc_intrinsic]
29192867
#[rustc_intrinsic_must_be_overridden]
2920-
#[cfg(not(bootstrap))]
29212868
pub const fn type_id<T: ?Sized + 'static>() -> u128 {
29222869
unreachable!()
29232870
}

Diff for: ‎core/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@
192192
//
193193
// Language features:
194194
// tidy-alphabetical-start
195-
#![cfg_attr(bootstrap, feature(c_unwind))]
196-
#![cfg_attr(bootstrap, feature(effects))]
197195
#![feature(abi_unadjusted)]
198196
#![feature(adt_const_params)]
199197
#![feature(allow_internal_unsafe)]

Diff for: ‎core/src/marker.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,6 @@ pub trait FnPtr: Copy + Clone {
10601060
}
10611061

10621062
/// Derive macro generating impls of traits related to smart pointers.
1063-
#[cfg(not(bootstrap))]
10641063
#[rustc_builtin_macro]
10651064
#[allow_internal_unstable(dispatch_from_dyn, coerce_unsized, unsize)]
10661065
#[unstable(feature = "derive_smart_pointer", issue = "123430")]
@@ -1078,7 +1077,6 @@ pub macro SmartPointer($item:item) {
10781077
reason = "internal module for implementing effects"
10791078
)]
10801079
#[allow(missing_debug_implementations)] // these unit structs don't need `Debug` impls.
1081-
#[cfg(not(bootstrap))]
10821080
pub mod effects {
10831081
#[lang = "EffectsNoRuntime"]
10841082
pub struct NoRuntime;

Diff for: ‎core/src/num/f128.rs

-20
Original file line numberDiff line numberDiff line change
@@ -234,24 +234,20 @@ impl f128 {
234234
/// This constant isn't guaranteed to equal to any specific NaN bitpattern,
235235
/// and the stability of its representation over Rust versions
236236
/// and target platforms isn't guaranteed.
237-
#[cfg(not(bootstrap))]
238237
#[allow(clippy::eq_op)]
239238
#[rustc_diagnostic_item = "f128_nan"]
240239
#[unstable(feature = "f128", issue = "116909")]
241240
pub const NAN: f128 = 0.0_f128 / 0.0_f128;
242241

243242
/// Infinity (∞).
244-
#[cfg(not(bootstrap))]
245243
#[unstable(feature = "f128", issue = "116909")]
246244
pub const INFINITY: f128 = 1.0_f128 / 0.0_f128;
247245

248246
/// Negative infinity (−∞).
249-
#[cfg(not(bootstrap))]
250247
#[unstable(feature = "f128", issue = "116909")]
251248
pub const NEG_INFINITY: f128 = -1.0_f128 / 0.0_f128;
252249

253250
/// Sign bit
254-
#[cfg(not(bootstrap))]
255251
pub(crate) const SIGN_MASK: u128 = 0x8000_0000_0000_0000_0000_0000_0000_0000;
256252

257253
/// Exponent mask
@@ -261,11 +257,9 @@ impl f128 {
261257
pub(crate) const MAN_MASK: u128 = 0x0000_ffff_ffff_ffff_ffff_ffff_ffff_ffff;
262258

263259
/// Minimum representable positive value (min subnormal)
264-
#[cfg(not(bootstrap))]
265260
const TINY_BITS: u128 = 0x1;
266261

267262
/// Minimum representable negative value (min negative subnormal)
268-
#[cfg(not(bootstrap))]
269263
const NEG_TINY_BITS: u128 = Self::TINY_BITS | Self::SIGN_MASK;
270264

271265
/// Returns `true` if this value is NaN.
@@ -284,7 +278,6 @@ impl f128 {
284278
/// ```
285279
#[inline]
286280
#[must_use]
287-
#[cfg(not(bootstrap))]
288281
#[unstable(feature = "f128", issue = "116909")]
289282
#[allow(clippy::eq_op)] // > if you intended to check if the operand is NaN, use `.is_nan()` instead :)
290283
pub const fn is_nan(self) -> bool {
@@ -295,7 +288,6 @@ impl f128 {
295288
// concerns about portability, so this implementation is for
296289
// private use internally.
297290
#[inline]
298-
#[cfg(not(bootstrap))]
299291
#[rustc_const_unstable(feature = "const_float_classify", issue = "72505")]
300292
pub(crate) const fn abs_private(self) -> f128 {
301293
// SAFETY: This transmutation is fine. Probably. For the reasons std is using it.
@@ -326,7 +318,6 @@ impl f128 {
326318
/// ```
327319
#[inline]
328320
#[must_use]
329-
#[cfg(not(bootstrap))]
330321
#[unstable(feature = "f128", issue = "116909")]
331322
#[rustc_const_unstable(feature = "const_float_classify", issue = "72505")]
332323
pub const fn is_infinite(self) -> bool {
@@ -354,7 +345,6 @@ impl f128 {
354345
/// ```
355346
#[inline]
356347
#[must_use]
357-
#[cfg(not(bootstrap))]
358348
#[unstable(feature = "f128", issue = "116909")]
359349
#[rustc_const_unstable(feature = "const_float_classify", issue = "72505")]
360350
pub const fn is_finite(self) -> bool {
@@ -389,7 +379,6 @@ impl f128 {
389379
/// [subnormal]: https://en.wikipedia.org/wiki/Denormal_number
390380
#[inline]
391381
#[must_use]
392-
#[cfg(not(bootstrap))]
393382
#[unstable(feature = "f128", issue = "116909")]
394383
#[rustc_const_unstable(feature = "const_float_classify", issue = "72505")]
395384
pub const fn is_subnormal(self) -> bool {
@@ -422,7 +411,6 @@ impl f128 {
422411
/// [subnormal]: https://en.wikipedia.org/wiki/Denormal_number
423412
#[inline]
424413
#[must_use]
425-
#[cfg(not(bootstrap))]
426414
#[unstable(feature = "f128", issue = "116909")]
427415
#[rustc_const_unstable(feature = "const_float_classify", issue = "72505")]
428416
pub const fn is_normal(self) -> bool {
@@ -448,7 +436,6 @@ impl f128 {
448436
/// # }
449437
/// ```
450438
#[inline]
451-
#[cfg(not(bootstrap))]
452439
#[unstable(feature = "f128", issue = "116909")]
453440
#[rustc_const_unstable(feature = "const_float_classify", issue = "72505")]
454441
pub const fn classify(self) -> FpCategory {
@@ -557,7 +544,6 @@ impl f128 {
557544
/// [`MIN`]: Self::MIN
558545
/// [`MAX`]: Self::MAX
559546
#[inline]
560-
#[cfg(not(bootstrap))]
561547
#[unstable(feature = "f128", issue = "116909")]
562548
// #[unstable(feature = "float_next_up_down", issue = "91399")]
563549
pub fn next_up(self) -> Self {
@@ -612,7 +598,6 @@ impl f128 {
612598
/// [`MIN`]: Self::MIN
613599
/// [`MAX`]: Self::MAX
614600
#[inline]
615-
#[cfg(not(bootstrap))]
616601
#[unstable(feature = "f128", issue = "116909")]
617602
// #[unstable(feature = "float_next_up_down", issue = "91399")]
618603
pub fn next_down(self) -> Self {
@@ -649,7 +634,6 @@ impl f128 {
649634
/// # }
650635
/// ```
651636
#[inline]
652-
#[cfg(not(bootstrap))]
653637
#[unstable(feature = "f128", issue = "116909")]
654638
#[must_use = "this returns the result of the operation, without modifying the original"]
655639
pub fn recip(self) -> Self {
@@ -670,7 +654,6 @@ impl f128 {
670654
/// # }
671655
/// ```
672656
#[inline]
673-
#[cfg(not(bootstrap))]
674657
#[unstable(feature = "f128", issue = "116909")]
675658
#[must_use = "this returns the result of the operation, without modifying the original"]
676659
pub fn to_degrees(self) -> Self {
@@ -694,7 +677,6 @@ impl f128 {
694677
/// # }
695678
/// ```
696679
#[inline]
697-
#[cfg(not(bootstrap))]
698680
#[unstable(feature = "f128", issue = "116909")]
699681
#[must_use = "this returns the result of the operation, without modifying the original"]
700682
pub fn to_radians(self) -> f128 {
@@ -1141,7 +1123,6 @@ impl f128 {
11411123
/// ```
11421124
#[inline]
11431125
#[must_use]
1144-
#[cfg(not(bootstrap))]
11451126
#[unstable(feature = "f128", issue = "116909")]
11461127
pub fn total_cmp(&self, other: &Self) -> crate::cmp::Ordering {
11471128
let mut left = self.to_bits() as i128;
@@ -1201,7 +1182,6 @@ impl f128 {
12011182
/// # }
12021183
/// ```
12031184
#[inline]
1204-
#[cfg(not(bootstrap))]
12051185
#[unstable(feature = "f128", issue = "116909")]
12061186
#[must_use = "method returns a new number and does not mutate the original value"]
12071187
pub fn clamp(mut self, min: f128, max: f128) -> f128 {

0 commit comments

Comments
 (0)