Skip to content

Commit b221c87

Browse files
Mark-SimulacrumMark-Simulacrum
committed
Apply cfg-bootstrap switch
1 parent e9bc25d commit b221c87

File tree

16 files changed

+9
-38
lines changed

16 files changed

+9
-38
lines changed

‎compiler/rustc_borrowck/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![feature(bool_to_option)]
44
#![feature(box_patterns)]
55
#![feature(crate_visibility_modifier)]
6-
#![cfg_attr(bootstrap, feature(format_args_capture))]
76
#![feature(in_band_lifetimes)]
87
#![feature(iter_zip)]
98
#![feature(let_else)]

‎compiler/rustc_errors/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#![feature(crate_visibility_modifier)]
77
#![feature(backtrace)]
88
#![feature(if_let_guard)]
9-
#![cfg_attr(bootstrap, feature(format_args_capture))]
109
#![feature(iter_zip)]
1110
#![feature(let_else)]
1211
#![feature(nll)]

‎compiler/rustc_expand/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![feature(crate_visibility_modifier)]
22
#![feature(decl_macro)]
33
#![feature(destructuring_assignment)]
4-
#![cfg_attr(bootstrap, feature(format_args_capture))]
54
#![feature(if_let_guard)]
65
#![feature(iter_zip)]
76
#![feature(let_else)]

‎compiler/rustc_lint/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#![feature(bool_to_option)]
3131
#![feature(box_patterns)]
3232
#![feature(crate_visibility_modifier)]
33-
#![cfg_attr(bootstrap, feature(format_args_capture))]
3433
#![feature(iter_order_by)]
3534
#![feature(iter_zip)]
3635
#![feature(never_type)]

‎compiler/rustc_passes/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
88
#![feature(crate_visibility_modifier)]
99
#![feature(in_band_lifetimes)]
10-
#![cfg_attr(bootstrap, feature(format_args_capture))]
1110
#![feature(iter_zip)]
1211
#![feature(map_try_insert)]
1312
#![feature(min_specialization)]

‎compiler/rustc_resolve/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#![feature(drain_filter)]
1414
#![feature(bool_to_option)]
1515
#![feature(crate_visibility_modifier)]
16-
#![cfg_attr(bootstrap, feature(format_args_capture))]
1716
#![feature(iter_zip)]
1817
#![feature(let_else)]
1918
#![feature(never_type)]

‎compiler/rustc_typeck/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ This API is completely unstable and subject to change.
5858
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
5959
#![feature(bool_to_option)]
6060
#![feature(crate_visibility_modifier)]
61-
#![cfg_attr(bootstrap, feature(format_args_capture))]
6261
#![feature(if_let_guard)]
6362
#![feature(in_band_lifetimes)]
6463
#![feature(is_sorted)]

‎library/alloc/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
#![feature(fmt_internals)]
106106
#![feature(fn_traits)]
107107
#![feature(inherent_ascii_escape)]
108-
#![cfg_attr(bootstrap, feature(format_args_capture))]
109108
#![feature(inplace_iteration)]
110109
#![feature(iter_advance_by)]
111110
#![feature(iter_zip)]

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

-5
Original file line numberDiff line numberDiff line change
@@ -330,11 +330,9 @@ impl<T: Ord, const N: usize> Ord for [T; N] {
330330
}
331331
}
332332

333-
#[cfg(not(bootstrap))]
334333
#[stable(feature = "copy_clone_array_lib", since = "1.58.0")]
335334
impl<T: Copy, const N: usize> Copy for [T; N] {}
336335

337-
#[cfg(not(bootstrap))]
338336
#[stable(feature = "copy_clone_array_lib", since = "1.58.0")]
339337
impl<T: Clone, const N: usize> Clone for [T; N] {
340338
#[inline]
@@ -348,12 +346,10 @@ impl<T: Clone, const N: usize> Clone for [T; N] {
348346
}
349347
}
350348

351-
#[cfg(not(bootstrap))]
352349
trait SpecArrayClone: Clone {
353350
fn clone<const N: usize>(array: &[Self; N]) -> [Self; N];
354351
}
355352

356-
#[cfg(not(bootstrap))]
357353
impl<T: Clone> SpecArrayClone for T {
358354
#[inline]
359355
default fn clone<const N: usize>(array: &[T; N]) -> [T; N] {
@@ -363,7 +359,6 @@ impl<T: Clone> SpecArrayClone for T {
363359
}
364360
}
365361

366-
#[cfg(not(bootstrap))]
367362
impl<T: Copy> SpecArrayClone for T {
368363
#[inline]
369364
fn clone<const N: usize>(array: &[T; N]) -> [T; N] {

‎library/core/src/lib.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,12 @@
159159
#![feature(const_impl_trait)]
160160
#![feature(const_mut_refs)]
161161
#![feature(const_precise_live_drops)]
162-
#![cfg_attr(bootstrap, feature(const_raw_ptr_deref))]
163162
#![feature(const_refs_to_cell)]
164163
#![feature(decl_macro)]
165164
#![feature(derive_default_enum)]
166165
#![feature(doc_cfg)]
167166
#![feature(doc_notable_trait)]
168-
#![cfg_attr(bootstrap, feature(doc_primitive))]
169-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
167+
#![feature(rustdoc_internals)]
170168
#![feature(exhaustive_patterns)]
171169
#![feature(doc_cfg_hide)]
172170
#![feature(extern_types)]
@@ -198,7 +196,7 @@
198196
#![feature(try_blocks)]
199197
#![feature(unboxed_closures)]
200198
#![feature(unsized_fn_params)]
201-
#![cfg_attr(not(bootstrap), feature(asm_const))]
199+
#![feature(asm_const)]
202200
//
203201
// Target features:
204202
#![feature(aarch64_target_feature)]
@@ -408,13 +406,11 @@ pub mod arch {
408406
#[allow(rustdoc::bare_urls)]
409407
#[unstable(feature = "portable_simd", issue = "86656")]
410408
#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics
411-
#[cfg(not(bootstrap))]
412409
mod core_simd;
413410

414411
#[doc = include_str!("../../portable-simd/crates/core_simd/src/core_simd_docs.md")]
415412
#[unstable(feature = "portable_simd", issue = "86656")]
416413
#[cfg(not(all(miri, doctest)))] // Miri does not support all SIMD intrinsics
417-
#[cfg(not(bootstrap))]
418414
pub mod simd {
419415
#[unstable(feature = "portable_simd", issue = "86656")]
420416
pub use crate::core_simd::simd::*;

‎library/core/src/mem/maybe_uninit.rs

-1
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,6 @@ impl<T> MaybeUninit<T> {
789789
/// ```
790790
#[stable(feature = "maybe_uninit_ref", since = "1.55.0")]
791791
#[rustc_const_stable(feature = "const_maybe_uninit_assume_init", since = "1.59.0")]
792-
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_raw_ptr_deref))]
793792
#[inline(always)]
794793
pub const unsafe fn assume_init_ref(&self) -> &T {
795794
// SAFETY: the caller must guarantee that `self` is initialized.

‎library/core/src/ops/generator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub trait Generator<R = ()> {
8282
/// `return` statement or implicitly as the last expression of a generator
8383
/// literal. For example futures would use this as `Result<T, E>` as it
8484
/// represents a completed future.
85-
#[cfg_attr(not(bootstrap), lang = "generator_return")]
85+
#[lang = "generator_return"]
8686
type Return;
8787

8888
/// Resumes the execution of this generator.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub const unsafe fn from_raw_parts_mut<'a, T>(data: *mut T, len: usize) -> &'a m
131131
}
132132

133133
// In debug builds checks that `data` pointer is aligned and non-null and that slice with given `len` would cover less than half the address space
134-
#[cfg(all(not(bootstrap), debug_assertions))]
134+
#[cfg(debug_assertions)]
135135
#[unstable(feature = "const_slice_from_raw_parts", issue = "67456")]
136136
#[rustc_const_unstable(feature = "const_slice_from_raw_parts", issue = "67456")]
137137
const fn debug_check_data_len<T>(data: *const T, len: usize) {
@@ -161,7 +161,7 @@ const fn debug_check_data_len<T>(data: *const T, len: usize) {
161161
);
162162
}
163163

164-
#[cfg(not(all(not(bootstrap), debug_assertions)))]
164+
#[cfg(not(debug_assertions))]
165165
const fn debug_check_data_len<T>(_data: *const T, _len: usize) {}
166166

167167
/// Converts a reference to T into a slice of length 1 (without copying).

‎library/core/src/time.rs

-5
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ impl Duration {
182182
#[inline]
183183
#[must_use]
184184
#[rustc_const_stable(feature = "duration_consts_2", since = "1.58.0")]
185-
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_panic))]
186185
pub const fn new(secs: u64, nanos: u32) -> Duration {
187186
let secs = match secs.checked_add((nanos / NANOS_PER_SEC) as u64) {
188187
Some(secs) => secs,
@@ -482,7 +481,6 @@ impl Duration {
482481
without modifying the original"]
483482
#[inline]
484483
#[rustc_const_stable(feature = "duration_consts_2", since = "1.58.0")]
485-
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_panic))]
486484
pub const fn checked_add(self, rhs: Duration) -> Option<Duration> {
487485
if let Some(mut secs) = self.secs.checked_add(rhs.secs) {
488486
let mut nanos = self.nanos + rhs.nanos;
@@ -543,7 +541,6 @@ impl Duration {
543541
without modifying the original"]
544542
#[inline]
545543
#[rustc_const_stable(feature = "duration_consts_2", since = "1.58.0")]
546-
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_panic))]
547544
pub const fn checked_sub(self, rhs: Duration) -> Option<Duration> {
548545
if let Some(mut secs) = self.secs.checked_sub(rhs.secs) {
549546
let nanos = if self.nanos >= rhs.nanos {
@@ -602,7 +599,6 @@ impl Duration {
602599
without modifying the original"]
603600
#[inline]
604601
#[rustc_const_stable(feature = "duration_consts_2", since = "1.58.0")]
605-
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_panic))]
606602
pub const fn checked_mul(self, rhs: u32) -> Option<Duration> {
607603
// Multiply nanoseconds as u64, because it cannot overflow that way.
608604
let total_nanos = self.nanos as u64 * rhs as u64;
@@ -660,7 +656,6 @@ impl Duration {
660656
without modifying the original"]
661657
#[inline]
662658
#[rustc_const_stable(feature = "duration_consts_2", since = "1.58.0")]
663-
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(const_panic))]
664659
pub const fn checked_div(self, rhs: u32) -> Option<Duration> {
665660
if rhs != 0 {
666661
let secs = self.secs / (rhs as u64);

‎library/core/tests/lib.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@
5858
#![feature(const_mut_refs)]
5959
#![feature(const_pin)]
6060
#![feature(const_slice_from_raw_parts)]
61-
#![cfg_attr(bootstrap, feature(const_raw_ptr_deref))]
6261
#![feature(never_type)]
6362
#![feature(unwrap_infallible)]
6463
#![feature(result_into_ok_or_err)]
65-
#![cfg_attr(not(bootstrap), feature(portable_simd))]
64+
#![feature(portable_simd)]
6665
#![feature(ptr_metadata)]
6766
#![feature(once_cell)]
6867
#![feature(unsized_tuple_coercion)]
@@ -108,7 +107,6 @@ mod pattern;
108107
mod pin;
109108
mod ptr;
110109
mod result;
111-
#[cfg(not(bootstrap))]
112110
mod simd;
113111
mod slice;
114112
mod str;

‎library/std/src/lib.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,7 @@
264264
#![feature(const_ipv4)]
265265
#![feature(const_ipv6)]
266266
#![feature(const_option)]
267-
#![cfg_attr(bootstrap, feature(const_raw_ptr_deref))]
268-
#![cfg_attr(not(bootstrap), feature(const_mut_refs))]
267+
#![feature(const_mut_refs)]
269268
#![feature(const_socketaddr)]
270269
#![feature(const_trait_impl)]
271270
#![feature(container_error_extra)]
@@ -275,9 +274,7 @@
275274
#![feature(decl_macro)]
276275
#![feature(doc_cfg)]
277276
#![feature(doc_cfg_hide)]
278-
#![cfg_attr(bootstrap, feature(doc_primitive))]
279-
#![cfg_attr(bootstrap, feature(doc_keyword))]
280-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
277+
#![feature(rustdoc_internals)]
281278
#![feature(doc_masked)]
282279
#![feature(doc_notable_trait)]
283280
#![feature(dropck_eyepatch)]
@@ -323,7 +320,7 @@
323320
#![feature(panic_internals)]
324321
#![feature(panic_unwind)]
325322
#![feature(pin_static_ref)]
326-
#![cfg_attr(not(bootstrap), feature(portable_simd))]
323+
#![feature(portable_simd)]
327324
#![feature(prelude_import)]
328325
#![feature(ptr_internals)]
329326
#![feature(rustc_attrs)]
@@ -476,7 +473,6 @@ pub use core::ptr;
476473
#[stable(feature = "rust1", since = "1.0.0")]
477474
pub use core::result;
478475
#[unstable(feature = "portable_simd", issue = "86656")]
479-
#[cfg(not(bootstrap))]
480476
pub use core::simd;
481477
#[unstable(feature = "async_stream", issue = "79024")]
482478
pub use core::stream;

0 commit comments

Comments
 (0)