Skip to content

Commit 9054e9d

Browse files
borsbors
committed
Auto merge of rust-lang#139279 - BoxyUwU:bump-boostrap, r=jieyouxu
Bump boostrap compiler to new beta try-job: `*msvc*`
2 parents 1e4dce6 + e552ad6 commit 9054e9d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+162
-270
lines changed

Diff for: ‎alloc/src/alloc.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ unsafe extern "Rust" {
1616
// otherwise.
1717
#[rustc_allocator]
1818
#[rustc_nounwind]
19-
#[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
19+
#[rustc_std_internal_symbol]
2020
fn __rust_alloc(size: usize, align: usize) -> *mut u8;
2121
#[rustc_deallocator]
2222
#[rustc_nounwind]
23-
#[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
23+
#[rustc_std_internal_symbol]
2424
fn __rust_dealloc(ptr: *mut u8, size: usize, align: usize);
2525
#[rustc_reallocator]
2626
#[rustc_nounwind]
27-
#[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
27+
#[rustc_std_internal_symbol]
2828
fn __rust_realloc(ptr: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8;
2929
#[rustc_allocator_zeroed]
3030
#[rustc_nounwind]
31-
#[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
31+
#[rustc_std_internal_symbol]
3232
fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8;
3333

34-
#[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
34+
#[rustc_std_internal_symbol]
3535
static __rust_no_alloc_shim_is_unstable: u8;
3636
}
3737

@@ -360,7 +360,7 @@ unsafe extern "Rust" {
360360
// This is the magic symbol to call the global alloc error handler. rustc generates
361361
// it to call `__rg_oom` if there is a `#[alloc_error_handler]`, or to call the
362362
// default implementations below (`__rdl_oom`) otherwise.
363-
#[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
363+
#[rustc_std_internal_symbol]
364364
fn __rust_alloc_error_handler(size: usize, align: usize) -> !;
365365
}
366366

@@ -427,7 +427,7 @@ pub mod __alloc_error_handler {
427427
unsafe extern "Rust" {
428428
// This symbol is emitted by rustc next to __rust_alloc_error_handler.
429429
// Its value depends on the -Zoom={panic,abort} compiler option.
430-
#[cfg_attr(not(bootstrap), rustc_std_internal_symbol)]
430+
#[rustc_std_internal_symbol]
431431
static __rust_alloc_error_handler_should_panic: u8;
432432
}
433433

Diff for: ‎alloc/src/boxed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ impl<T, A: Allocator> Box<mem::MaybeUninit<T>, A> {
952952
/// assert_eq!(*x, i);
953953
/// }
954954
/// ```
955-
#[stable(feature = "box_uninit_write", since = "CURRENT_RUSTC_VERSION")]
955+
#[stable(feature = "box_uninit_write", since = "1.87.0")]
956956
#[inline]
957957
pub fn write(mut boxed: Self, value: T) -> Box<T, A> {
958958
unsafe {

Diff for: ‎alloc/src/collections/btree/set_val.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub(super) struct SetValZST;
99
/// Returns `true` only for type `SetValZST`, `false` for all other types (blanket implementation).
1010
/// `TypeId` requires a `'static` lifetime, use of this trait avoids that restriction.
1111
///
12-
/// [`TypeId`]: std::any::TypeId
12+
/// [`TypeId`]: core::any::TypeId
1313
pub(super) trait IsSetVal {
1414
fn is_set_val() -> bool;
1515
}

Diff for: ‎alloc/src/collections/linked_list.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ impl<T, A: Allocator> LinkedList<T, A> {
11511151
/// assert_eq!(evens.into_iter().collect::<Vec<_>>(), vec![2, 4, 6, 8, 14]);
11521152
/// assert_eq!(odds.into_iter().collect::<Vec<_>>(), vec![1, 3, 5, 9, 11, 13, 15]);
11531153
/// ```
1154-
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
1154+
#[stable(feature = "extract_if", since = "1.87.0")]
11551155
pub fn extract_if<F>(&mut self, filter: F) -> ExtractIf<'_, T, F, A>
11561156
where
11571157
F: FnMut(&mut T) -> bool,
@@ -1931,7 +1931,7 @@ impl<'a, T, A: Allocator> CursorMut<'a, T, A> {
19311931
}
19321932

19331933
/// An iterator produced by calling `extract_if` on LinkedList.
1934-
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
1934+
#[stable(feature = "extract_if", since = "1.87.0")]
19351935
#[must_use = "iterators are lazy and do nothing unless consumed"]
19361936
pub struct ExtractIf<
19371937
'a,
@@ -1946,7 +1946,7 @@ pub struct ExtractIf<
19461946
old_len: usize,
19471947
}
19481948

1949-
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
1949+
#[stable(feature = "extract_if", since = "1.87.0")]
19501950
impl<T, F, A: Allocator> Iterator for ExtractIf<'_, T, F, A>
19511951
where
19521952
F: FnMut(&mut T) -> bool,
@@ -1975,7 +1975,7 @@ where
19751975
}
19761976
}
19771977

1978-
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
1978+
#[stable(feature = "extract_if", since = "1.87.0")]
19791979
impl<T: fmt::Debug, F> fmt::Debug for ExtractIf<'_, T, F> {
19801980
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
19811981
f.debug_tuple("ExtractIf").field(&self.list).finish()

Diff for: ‎alloc/src/string.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ impl String {
10431043
#[inline]
10441044
#[must_use = "`self` will be dropped if the result is not used"]
10451045
#[stable(feature = "rust1", since = "1.0.0")]
1046-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1046+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
10471047
#[rustc_allow_const_fn_unstable(const_precise_live_drops)]
10481048
pub const fn into_bytes(self) -> Vec<u8> {
10491049
self.vec
@@ -1062,7 +1062,7 @@ impl String {
10621062
#[must_use]
10631063
#[stable(feature = "string_as_str", since = "1.7.0")]
10641064
#[rustc_diagnostic_item = "string_as_str"]
1065-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1065+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
10661066
pub const fn as_str(&self) -> &str {
10671067
// SAFETY: String contents are stipulated to be valid UTF-8, invalid contents are an error
10681068
// at construction.
@@ -1085,7 +1085,7 @@ impl String {
10851085
#[must_use]
10861086
#[stable(feature = "string_as_str", since = "1.7.0")]
10871087
#[rustc_diagnostic_item = "string_as_mut_str"]
1088-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1088+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
10891089
pub const fn as_mut_str(&mut self) -> &mut str {
10901090
// SAFETY: String contents are stipulated to be valid UTF-8, invalid contents are an error
10911091
// at construction.
@@ -1134,7 +1134,7 @@ impl String {
11341134
/// assert_eq!(string, "abcdecdeabecde");
11351135
/// ```
11361136
#[cfg(not(no_global_oom_handling))]
1137-
#[stable(feature = "string_extend_from_within", since = "CURRENT_RUSTC_VERSION")]
1137+
#[stable(feature = "string_extend_from_within", since = "1.87.0")]
11381138
pub fn extend_from_within<R>(&mut self, src: R)
11391139
where
11401140
R: RangeBounds<usize>,
@@ -1159,7 +1159,7 @@ impl String {
11591159
#[inline]
11601160
#[must_use]
11611161
#[stable(feature = "rust1", since = "1.0.0")]
1162-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1162+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
11631163
pub const fn capacity(&self) -> usize {
11641164
self.vec.capacity()
11651165
}
@@ -1428,7 +1428,7 @@ impl String {
14281428
#[inline]
14291429
#[must_use]
14301430
#[stable(feature = "rust1", since = "1.0.0")]
1431-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1431+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
14321432
pub const fn as_bytes(&self) -> &[u8] {
14331433
self.vec.as_slice()
14341434
}
@@ -1808,7 +1808,7 @@ impl String {
18081808
/// ```
18091809
#[inline]
18101810
#[stable(feature = "rust1", since = "1.0.0")]
1811-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1811+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
18121812
pub const unsafe fn as_mut_vec(&mut self) -> &mut Vec<u8> {
18131813
&mut self.vec
18141814
}
@@ -1830,7 +1830,7 @@ impl String {
18301830
#[inline]
18311831
#[must_use]
18321832
#[stable(feature = "rust1", since = "1.0.0")]
1833-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1833+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
18341834
#[rustc_confusables("length", "size")]
18351835
pub const fn len(&self) -> usize {
18361836
self.vec.len()
@@ -1850,7 +1850,7 @@ impl String {
18501850
#[inline]
18511851
#[must_use]
18521852
#[stable(feature = "rust1", since = "1.0.0")]
1853-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1853+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
18541854
pub const fn is_empty(&self) -> bool {
18551855
self.len() == 0
18561856
}
@@ -3169,7 +3169,7 @@ impl From<String> for Vec<u8> {
31693169
}
31703170
}
31713171

3172-
#[stable(feature = "try_from_vec_u8_for_string", since = "CURRENT_RUSTC_VERSION")]
3172+
#[stable(feature = "try_from_vec_u8_for_string", since = "1.87.0")]
31733173
impl TryFrom<Vec<u8>> for String {
31743174
type Error = FromUtf8Error;
31753175
/// Converts the given [`Vec<u8>`] into a [`String`] if it contains valid UTF-8 data.

Diff for: ‎alloc/src/vec/extract_if.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::alloc::{Allocator, Global};
1515
/// let mut v = vec![0, 1, 2];
1616
/// let iter: std::vec::ExtractIf<'_, _, _> = v.extract_if(.., |x| *x % 2 == 0);
1717
/// ```
18-
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
18+
#[stable(feature = "extract_if", since = "1.87.0")]
1919
#[derive(Debug)]
2020
#[must_use = "iterators are lazy and do nothing unless consumed"]
2121
pub struct ExtractIf<
@@ -57,7 +57,7 @@ impl<'a, T, F, A: Allocator> ExtractIf<'a, T, F, A> {
5757
}
5858
}
5959

60-
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
60+
#[stable(feature = "extract_if", since = "1.87.0")]
6161
impl<T, F, A: Allocator> Iterator for ExtractIf<'_, T, F, A>
6262
where
6363
F: FnMut(&mut T) -> bool,
@@ -93,7 +93,7 @@ where
9393
}
9494
}
9595

96-
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
96+
#[stable(feature = "extract_if", since = "1.87.0")]
9797
impl<T, F, A: Allocator> Drop for ExtractIf<'_, T, F, A> {
9898
fn drop(&mut self) {
9999
unsafe {

Diff for: ‎alloc/src/vec/mod.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ use core::ptr::{self, NonNull};
6666
use core::slice::{self, SliceIndex};
6767
use core::{fmt, intrinsics};
6868

69-
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
69+
#[stable(feature = "extract_if", since = "1.87.0")]
7070
pub use self::extract_if::ExtractIf;
7171
use crate::alloc::{Allocator, Global};
7272
use crate::borrow::{Cow, ToOwned};
@@ -1267,7 +1267,7 @@ impl<T, A: Allocator> Vec<T, A> {
12671267
/// ```
12681268
#[inline]
12691269
#[stable(feature = "rust1", since = "1.0.0")]
1270-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1270+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
12711271
pub const fn capacity(&self) -> usize {
12721272
self.buf.capacity()
12731273
}
@@ -1582,7 +1582,7 @@ impl<T, A: Allocator> Vec<T, A> {
15821582
#[inline]
15831583
#[stable(feature = "vec_as_slice", since = "1.7.0")]
15841584
#[rustc_diagnostic_item = "vec_as_slice"]
1585-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1585+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
15861586
pub const fn as_slice(&self) -> &[T] {
15871587
// SAFETY: `slice::from_raw_parts` requires pointee is a contiguous, aligned buffer of size
15881588
// `len` containing properly-initialized `T`s. Data must not be mutated for the returned
@@ -1614,7 +1614,7 @@ impl<T, A: Allocator> Vec<T, A> {
16141614
#[inline]
16151615
#[stable(feature = "vec_as_slice", since = "1.7.0")]
16161616
#[rustc_diagnostic_item = "vec_as_mut_slice"]
1617-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1617+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
16181618
pub const fn as_mut_slice(&mut self) -> &mut [T] {
16191619
// SAFETY: `slice::from_raw_parts_mut` requires pointee is a contiguous, aligned buffer of
16201620
// size `len` containing properly-initialized `T`s. Data must not be accessed through any
@@ -1686,7 +1686,7 @@ impl<T, A: Allocator> Vec<T, A> {
16861686
/// [`as_ptr`]: Vec::as_ptr
16871687
/// [`as_non_null`]: Vec::as_non_null
16881688
#[stable(feature = "vec_as_ptr", since = "1.37.0")]
1689-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1689+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
16901690
#[rustc_never_returns_null_ptr]
16911691
#[rustc_as_ptr]
16921692
#[inline]
@@ -1749,7 +1749,7 @@ impl<T, A: Allocator> Vec<T, A> {
17491749
/// [`as_ptr`]: Vec::as_ptr
17501750
/// [`as_non_null`]: Vec::as_non_null
17511751
#[stable(feature = "vec_as_ptr", since = "1.37.0")]
1752-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
1752+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
17531753
#[rustc_never_returns_null_ptr]
17541754
#[rustc_as_ptr]
17551755
#[inline]
@@ -2700,7 +2700,7 @@ impl<T, A: Allocator> Vec<T, A> {
27002700
/// ```
27012701
#[inline]
27022702
#[stable(feature = "rust1", since = "1.0.0")]
2703-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
2703+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
27042704
#[rustc_confusables("length", "size")]
27052705
pub const fn len(&self) -> usize {
27062706
let len = self.len;
@@ -2726,7 +2726,7 @@ impl<T, A: Allocator> Vec<T, A> {
27262726
/// ```
27272727
#[stable(feature = "rust1", since = "1.0.0")]
27282728
#[rustc_diagnostic_item = "vec_is_empty"]
2729-
#[rustc_const_stable(feature = "const_vec_string_slice", since = "CURRENT_RUSTC_VERSION")]
2729+
#[rustc_const_stable(feature = "const_vec_string_slice", since = "1.87.0")]
27302730
pub const fn is_empty(&self) -> bool {
27312731
self.len() == 0
27322732
}
@@ -3715,7 +3715,7 @@ impl<T, A: Allocator> Vec<T, A> {
37153715
/// assert_eq!(items, vec![0, 0, 0, 0, 0, 0, 0, 2, 2, 2]);
37163716
/// assert_eq!(ones.len(), 3);
37173717
/// ```
3718-
#[stable(feature = "extract_if", since = "CURRENT_RUSTC_VERSION")]
3718+
#[stable(feature = "extract_if", since = "1.87.0")]
37193719
pub fn extract_if<F, R>(&mut self, range: R, filter: F) -> ExtractIf<'_, T, F, A>
37203720
where
37213721
F: FnMut(&mut T) -> bool,

Diff for: ‎core/Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ check-cfg = [
3232
'cfg(bootstrap)',
3333
'cfg(no_fp_fmt_parse)',
3434
'cfg(stdarch_intel_sde)',
35-
# #[cfg(bootstrap)]
36-
'cfg(target_feature, values("vector-enhancements-1"))',
3735
# core use #[path] imports to portable-simd `core_simd` crate
3836
# and to stdarch `core_arch` crate which messes-up with Cargo list
3937
# of declared features, we therefor expect any feature cfg

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ impl char {
337337
/// '1'.is_digit(1);
338338
/// ```
339339
#[stable(feature = "rust1", since = "1.0.0")]
340-
#[rustc_const_stable(feature = "const_char_classify", since = "CURRENT_RUSTC_VERSION")]
340+
#[rustc_const_stable(feature = "const_char_classify", since = "1.87.0")]
341341
#[inline]
342342
pub const fn is_digit(self, radix: u32) -> bool {
343343
self.to_digit(radix).is_some()
@@ -886,7 +886,7 @@ impl char {
886886
/// ```
887887
#[must_use]
888888
#[stable(feature = "rust1", since = "1.0.0")]
889-
#[rustc_const_stable(feature = "const_char_classify", since = "CURRENT_RUSTC_VERSION")]
889+
#[rustc_const_stable(feature = "const_char_classify", since = "1.87.0")]
890890
#[inline]
891891
pub const fn is_whitespace(self) -> bool {
892892
match self {

Diff for: ‎core/src/clone.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ pub macro Clone($item:item) {
216216
/// Use closures allow captured values to be automatically used.
217217
/// This is similar to have a closure that you would call `.use` over each captured value.
218218
#[unstable(feature = "ergonomic_clones", issue = "132290")]
219-
#[cfg_attr(not(bootstrap), lang = "use_cloned")]
219+
#[lang = "use_cloned"]
220220
pub trait UseCloned: Clone {
221221
// Empty.
222222
}

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

-28
Original file line numberDiff line numberDiff line change
@@ -1515,19 +1515,6 @@ unsafe fn run(fmt: &mut Formatter<'_>, arg: &rt::Placeholder, args: &[rt::Argume
15151515
// which guarantees the indexes are always within bounds.
15161516
unsafe { (getcount(args, &arg.width), getcount(args, &arg.precision)) };
15171517

1518-
#[cfg(bootstrap)]
1519-
let options =
1520-
*FormattingOptions { flags: flags::ALWAYS_SET | arg.flags << 21, width: 0, precision: 0 }
1521-
.align(match arg.align {
1522-
rt::Alignment::Left => Some(Alignment::Left),
1523-
rt::Alignment::Right => Some(Alignment::Right),
1524-
rt::Alignment::Center => Some(Alignment::Center),
1525-
rt::Alignment::Unknown => None,
1526-
})
1527-
.fill(arg.fill)
1528-
.width(width)
1529-
.precision(precision);
1530-
#[cfg(not(bootstrap))]
15311518
let options = FormattingOptions { flags: arg.flags, width, precision };
15321519

15331520
// Extract the correct argument
@@ -1544,21 +1531,6 @@ unsafe fn run(fmt: &mut Formatter<'_>, arg: &rt::Placeholder, args: &[rt::Argume
15441531
unsafe { value.fmt(fmt) }
15451532
}
15461533

1547-
#[cfg(bootstrap)]
1548-
unsafe fn getcount(args: &[rt::Argument<'_>], cnt: &rt::Count) -> Option<u16> {
1549-
match *cnt {
1550-
rt::Count::Is(n) => Some(n as u16),
1551-
rt::Count::Implied => None,
1552-
rt::Count::Param(i) => {
1553-
debug_assert!(i < args.len());
1554-
// SAFETY: cnt and args come from the same Arguments,
1555-
// which guarantees this index is always within bounds.
1556-
unsafe { args.get_unchecked(i).as_u16() }
1557-
}
1558-
}
1559-
}
1560-
1561-
#[cfg(not(bootstrap))]
15621534
unsafe fn getcount(args: &[rt::Argument<'_>], cnt: &rt::Count) -> u16 {
15631535
match *cnt {
15641536
rt::Count::Is(n) => n,

0 commit comments

Comments
 (0)