Skip to content

Commit 0091b8a

Browse files
committed
update cfgs
1 parent a999870 commit 0091b8a

File tree

27 files changed

+28
-109
lines changed

27 files changed

+28
-109
lines changed

compiler/rustc_codegen_llvm/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
77
// tidy-alphabetical-start
88
#![allow(internal_features)]
9-
#![cfg_attr(bootstrap, feature(unsafe_extern_blocks))]
109
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
1110
#![doc(rust_logo)]
1211
#![feature(assert_matches)]

compiler/rustc_driver_impl/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// tidy-alphabetical-start
88
#![allow(internal_features)]
99
#![allow(rustc::untranslatable_diagnostic)] // FIXME: make this translatable
10-
#![cfg_attr(bootstrap, feature(unsafe_extern_blocks))]
1110
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
1211
#![doc(rust_logo)]
1312
#![feature(decl_macro)]

compiler/rustc_llvm/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// tidy-alphabetical-start
22
#![allow(internal_features)]
3-
#![cfg_attr(bootstrap, feature(unsafe_attributes, unsafe_extern_blocks))]
43
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
54
#![doc(rust_logo)]
65
#![feature(rustdoc_internals)]

compiler/rustc_middle/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#![allow(rustc::diagnostic_outside_of_impl)]
2929
#![allow(rustc::potential_query_instability)]
3030
#![allow(rustc::untranslatable_diagnostic)]
31-
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns, unsafe_extern_blocks))]
3231
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
3332
#![doc(rust_logo)]
3433
#![feature(allocator_api)]

compiler/rustc_target/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
1010
// tidy-alphabetical-start
1111
#![allow(internal_features)]
12-
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns))]
1312
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
1413
#![doc(rust_logo)]
1514
#![feature(assert_matches)]

compiler/rustc_transmute/src/layout/nfa.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ where
8787
pub(crate) fn from_tree(tree: Tree<!, R>) -> Result<Self, Uninhabited> {
8888
Ok(match tree {
8989
Tree::Byte(b) => Self::from_byte(b),
90-
#[cfg(bootstrap)]
91-
Tree::Def(..) => unreachable!(),
9290
Tree::Ref(r) => Self::from_ref(r),
9391
Tree::Alt(alts) => {
9492
let mut alts = alts.into_iter().map(Self::from_tree);

compiler/rustc_type_ir/src/fold.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ pub trait TypeFoldable<I: Interner>: TypeVisitable<I> {
9191
fn fold_with<F: TypeFolder<I>>(self, folder: &mut F) -> Self {
9292
match self.try_fold_with(folder) {
9393
Ok(t) => t,
94-
#[cfg(bootstrap)]
95-
Err(e) => match e {},
9694
}
9795
}
9896
}
@@ -116,8 +114,6 @@ pub trait TypeSuperFoldable<I: Interner>: TypeFoldable<I> {
116114
fn super_fold_with<F: TypeFolder<I>>(self, folder: &mut F) -> Self {
117115
match self.try_super_fold_with(folder) {
118116
Ok(t) => t,
119-
#[cfg(bootstrap)]
120-
Err(e) => match e {},
121117
}
122118
}
123119
}

library/alloc/src/collections/vec_deque/into_iter.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> {
121121
{
122122
match self.try_fold(init, |b, item| Ok::<B, !>(f(b, item))) {
123123
Ok(b) => b,
124-
#[cfg(bootstrap)]
125-
Err(e) => match e {},
126124
}
127125
}
128126

@@ -243,8 +241,6 @@ impl<T, A: Allocator> DoubleEndedIterator for IntoIter<T, A> {
243241
{
244242
match self.try_rfold(init, |b, item| Ok::<B, !>(f(b, item))) {
245243
Ok(b) => b,
246-
#[cfg(bootstrap)]
247-
Err(e) => match e {},
248244
}
249245
}
250246
}

library/core/src/arch.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44
#[stable(feature = "simd_arch", since = "1.27.0")]
55
pub use crate::core_arch::arch::*;
66

7-
#[cfg(bootstrap)]
8-
#[allow(dead_code)]
9-
#[unstable(feature = "sha512_sm_x86", issue = "126624")]
10-
fn dummy() {
11-
// AArch64 also has a target feature named `sm4`, so we need `#![feature(sha512_sm_x86)]` in lib.rs
12-
// But as the bootstrap compiler doesn't know about this feature yet, we need to convert it to a
13-
// library feature until bootstrap gets bumped
14-
}
15-
167
/// Inline assembly.
178
///
189
/// Refer to [Rust By Example] for a usage guide and the [reference] for

library/core/src/cell.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ pub use once::OnceCell;
306306
/// See the [module-level documentation](self) for more.
307307
#[stable(feature = "rust1", since = "1.0.0")]
308308
#[repr(transparent)]
309-
#[cfg_attr(not(bootstrap), rustc_pub_transparent)]
309+
#[rustc_pub_transparent]
310310
pub struct Cell<T: ?Sized> {
311311
value: UnsafeCell<T>,
312312
}
@@ -2056,7 +2056,7 @@ impl<T: ?Sized + fmt::Display> fmt::Display for RefMut<'_, T> {
20562056
#[lang = "unsafe_cell"]
20572057
#[stable(feature = "rust1", since = "1.0.0")]
20582058
#[repr(transparent)]
2059-
#[cfg_attr(not(bootstrap), rustc_pub_transparent)]
2059+
#[rustc_pub_transparent]
20602060
pub struct UnsafeCell<T: ?Sized> {
20612061
value: T,
20622062
}
@@ -2299,7 +2299,7 @@ impl<T> UnsafeCell<*mut T> {
22992299
/// See [`UnsafeCell`] for details.
23002300
#[unstable(feature = "sync_unsafe_cell", issue = "95439")]
23012301
#[repr(transparent)]
2302-
#[cfg_attr(not(bootstrap), rustc_pub_transparent)]
2302+
#[rustc_pub_transparent]
23032303
pub struct SyncUnsafeCell<T: ?Sized> {
23042304
value: UnsafeCell<T>,
23052305
}

0 commit comments

Comments
 (0)