Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 5b3462c

Browse files
pietroalbinipietroalbini
committed
update cfg(bootstrap)s
1 parent 970e603 commit 5b3462c

File tree

16 files changed

+55
-112
lines changed

16 files changed

+55
-112
lines changed

‎compiler/rustc_expand/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![feature(associated_type_defaults)]
33
#![feature(crate_visibility_modifier)]
44
#![feature(decl_macro)]
5-
#![cfg_attr(bootstrap, feature(destructuring_assignment))]
65
#![feature(if_let_guard)]
76
#![feature(let_else)]
87
#![feature(proc_macro_diagnostic)]

‎compiler/rustc_middle/src/query/mod.rs

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -784,24 +784,11 @@ rustc_queries! {
784784
desc { |tcx| "type-checking `{}`", tcx.def_path_str(key.to_def_id()) }
785785
cache_on_disk_if { true }
786786
load_cached(tcx, id) {
787-
#[cfg(bootstrap)]
788-
{
789-
match match tcx.on_disk_cache().as_ref() {
790-
Some(c) => c.try_load_query_result(*tcx, id),
791-
None => None,
792-
} {
793-
Some(x) => Some(&*tcx.arena.alloc(x)),
794-
None => None,
795-
}
796-
}
797-
#[cfg(not(bootstrap))]
798-
{
799-
let typeck_results: Option<ty::TypeckResults<'tcx>> = tcx
800-
.on_disk_cache().as_ref()
801-
.and_then(|c| c.try_load_query_result(*tcx, id));
787+
let typeck_results: Option<ty::TypeckResults<'tcx>> = tcx
788+
.on_disk_cache().as_ref()
789+
.and_then(|c| c.try_load_query_result(*tcx, id));
802790

803-
typeck_results.map(|x| &*tcx.arena.alloc(x))
804-
}
791+
typeck_results.map(|x| &*tcx.arena.alloc(x))
805792
}
806793
}
807794

‎library/alloc/src/lib.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,14 @@
6767
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
6868
test(no_crate_inject, attr(allow(unused_variables), deny(warnings)))
6969
)]
70-
#![cfg_attr(
71-
not(bootstrap),
72-
doc(cfg_hide(
73-
not(test),
74-
not(any(test, bootstrap)),
75-
any(not(feature = "miri-test-libstd"), test, doctest),
76-
no_global_oom_handling,
77-
not(no_global_oom_handling),
78-
target_has_atomic = "ptr"
79-
))
80-
)]
70+
#![doc(cfg_hide(
71+
not(test),
72+
not(any(test, bootstrap)),
73+
any(not(feature = "miri-test-libstd"), test, doctest),
74+
no_global_oom_handling,
75+
not(no_global_oom_handling),
76+
target_has_atomic = "ptr"
77+
))]
8178
#![no_std]
8279
#![needs_allocator]
8380
//
@@ -151,7 +148,6 @@
151148
#![feature(const_precise_live_drops)]
152149
#![feature(const_trait_impl)]
153150
#![feature(const_try)]
154-
#![cfg_attr(bootstrap, feature(destructuring_assignment))]
155151
#![feature(dropck_eyepatch)]
156152
#![feature(exclusive_range_pattern)]
157153
#![feature(fundamental)]

‎library/core/src/cell.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,11 +1310,7 @@ impl Clone for BorrowRef<'_> {
13101310
///
13111311
/// See the [module-level documentation](self) for more.
13121312
#[stable(feature = "rust1", since = "1.0.0")]
1313-
#[cfg_attr(
1314-
not(bootstrap),
1315-
must_not_suspend = "holding a Ref across suspend \
1316-
points can cause BorrowErrors"
1317-
)]
1313+
#[must_not_suspend = "holding a Ref across suspend points can cause BorrowErrors"]
13181314
pub struct Ref<'b, T: ?Sized + 'b> {
13191315
value: &'b T,
13201316
borrow: BorrowRef<'b>,
@@ -1692,11 +1688,7 @@ impl<'b> BorrowRefMut<'b> {
16921688
///
16931689
/// See the [module-level documentation](self) for more.
16941690
#[stable(feature = "rust1", since = "1.0.0")]
1695-
#[cfg_attr(
1696-
not(bootstrap),
1697-
must_not_suspend = "holding a RefMut across suspend \
1698-
points can cause BorrowErrors"
1699-
)]
1691+
#[must_not_suspend = "holding a RefMut across suspend points can cause BorrowErrors"]
17001692
pub struct RefMut<'b, T: ?Sized + 'b> {
17011693
value: &'b mut T,
17021694
borrow: BorrowRefMut<'b>,

‎library/core/src/future/into_future.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub trait IntoFuture {
1313

1414
/// Creates a future from a value.
1515
#[unstable(feature = "into_future", issue = "67644")]
16-
#[cfg_attr(not(bootstrap), lang = "into_future")]
16+
#[lang = "into_future"]
1717
fn into_future(self) -> Self::Future;
1818
}
1919

‎library/core/src/lib.rs

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -60,32 +60,29 @@
6060
test(no_crate_inject, attr(deny(warnings))),
6161
test(attr(allow(dead_code, deprecated, unused_variables, unused_mut)))
6262
)]
63-
#![cfg_attr(
64-
not(bootstrap),
65-
doc(cfg_hide(
66-
not(test),
67-
any(not(feature = "miri-test-libstd"), test, doctest),
68-
no_fp_fmt_parse,
69-
target_pointer_width = "16",
70-
target_pointer_width = "32",
71-
target_pointer_width = "64",
72-
target_has_atomic = "8",
73-
target_has_atomic = "16",
74-
target_has_atomic = "32",
75-
target_has_atomic = "64",
76-
target_has_atomic = "ptr",
77-
target_has_atomic_equal_alignment = "8",
78-
target_has_atomic_equal_alignment = "16",
79-
target_has_atomic_equal_alignment = "32",
80-
target_has_atomic_equal_alignment = "64",
81-
target_has_atomic_equal_alignment = "ptr",
82-
target_has_atomic_load_store = "8",
83-
target_has_atomic_load_store = "16",
84-
target_has_atomic_load_store = "32",
85-
target_has_atomic_load_store = "64",
86-
target_has_atomic_load_store = "ptr",
87-
))
88-
)]
63+
#![doc(cfg_hide(
64+
not(test),
65+
any(not(feature = "miri-test-libstd"), test, doctest),
66+
no_fp_fmt_parse,
67+
target_pointer_width = "16",
68+
target_pointer_width = "32",
69+
target_pointer_width = "64",
70+
target_has_atomic = "8",
71+
target_has_atomic = "16",
72+
target_has_atomic = "32",
73+
target_has_atomic = "64",
74+
target_has_atomic = "ptr",
75+
target_has_atomic_equal_alignment = "8",
76+
target_has_atomic_equal_alignment = "16",
77+
target_has_atomic_equal_alignment = "32",
78+
target_has_atomic_equal_alignment = "64",
79+
target_has_atomic_equal_alignment = "ptr",
80+
target_has_atomic_load_store = "8",
81+
target_has_atomic_load_store = "16",
82+
target_has_atomic_load_store = "32",
83+
target_has_atomic_load_store = "64",
84+
target_has_atomic_load_store = "ptr",
85+
))]
8986
#![no_core]
9087
//
9188
// Lints:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,6 @@ pub(crate) mod builtin {
10031003
/// assert_eq!(s, b"ABCDEF");
10041004
/// # }
10051005
/// ```
1006-
#[cfg(not(bootstrap))]
10071006
#[unstable(feature = "concat_bytes", issue = "87555")]
10081007
#[rustc_builtin_macro]
10091008
#[macro_export]

‎library/core/src/prelude/v1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ pub use crate::{
6565
issue = "87555",
6666
reason = "`concat_bytes` is not stable enough for use and is subject to change"
6767
)]
68-
#[cfg(not(bootstrap))]
6968
#[doc(no_inline)]
7069
pub use crate::concat_bytes;
7170

‎library/core/tests/cmp.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ fn cmp_default() {
204204
assert_eq!(Fool(false), Fool(true));
205205
}
206206

207-
#[cfg(not(bootstrap))]
208207
mod const_cmp {
209208
use super::*;
210209

‎library/core/tests/intrinsics.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ fn test_assume_can_be_in_const_contexts() {
3737
}
3838

3939
#[test]
40-
#[cfg(not(bootstrap))]
4140
const fn test_write_bytes_in_const_contexts() {
4241
use core::intrinsics::write_bytes;
4342

0 commit comments

Comments
 (0)