Skip to content

Commit 4e3a497

Browse files
Bump cfg(bootstrap)
1 parent cf57e50 commit 4e3a497

File tree

13 files changed

+16
-35
lines changed

13 files changed

+16
-35
lines changed

alloc/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
#![warn(missing_docs)]
8989
#![allow(explicit_outlives_requirements)]
9090
#![warn(multiple_supertrait_upcastable)]
91-
#![cfg_attr(not(bootstrap), allow(internal_features))]
92-
#![cfg_attr(not(bootstrap), allow(rustdoc::redundant_explicit_links))]
91+
#![allow(internal_features)]
92+
#![allow(rustdoc::redundant_explicit_links)]
9393
//
9494
// Library features:
9595
// tidy-alphabetical-start

alloc/tests/vec.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2499,7 +2499,6 @@ fn test_into_flattened_size_overflow() {
24992499
let _ = v.into_flattened();
25002500
}
25012501

2502-
#[cfg(not(bootstrap))]
25032502
#[test]
25042503
fn test_box_zero_allocator() {
25052504
use core::{alloc::AllocError, cell::RefCell};

core/src/cell.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,8 +1893,7 @@ impl<T: ?Sized + fmt::Display> fmt::Display for RefMut<'_, T> {
18931893
/// on an _exclusive_ `UnsafeCell<T>`. Even though `T` and `UnsafeCell<T>` have the
18941894
/// same memory layout, the following is not allowed and undefined behavior:
18951895
///
1896-
#[cfg_attr(bootstrap, doc = "```rust,no_run")]
1897-
#[cfg_attr(not(bootstrap), doc = "```rust,compile_fail")]
1896+
/// ```rust,compile_fail
18981897
/// # use std::cell::UnsafeCell;
18991898
/// unsafe fn not_allowed<T>(ptr: &UnsafeCell<T>) -> &mut T {
19001899
/// let t = ptr as *const UnsafeCell<T> as *mut T;

core/src/intrinsics.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,7 +2399,6 @@ extern "rust-intrinsic" {
23992399
/// that differs. That allows optimizations that can read in large chunks.
24002400
///
24012401
/// [valid]: crate::ptr#safety
2402-
#[cfg(not(bootstrap))]
24032402
#[rustc_const_unstable(feature = "const_intrinsic_compare_bytes", issue = "none")]
24042403
#[rustc_nounwind]
24052404
pub fn compare_bytes(left: *const u8, right: *const u8, bytes: usize) -> i32;
@@ -2844,18 +2843,3 @@ pub const unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize) {
28442843
write_bytes(dst, val, count)
28452844
}
28462845
}
2847-
2848-
/// Backfill for bootstrap
2849-
#[cfg(bootstrap)]
2850-
pub unsafe fn compare_bytes(left: *const u8, right: *const u8, bytes: usize) -> i32 {
2851-
extern "C" {
2852-
fn memcmp(s1: *const u8, s2: *const u8, n: usize) -> crate::ffi::c_int;
2853-
}
2854-
2855-
if bytes != 0 {
2856-
// SAFETY: Since bytes is non-zero, the caller has met `memcmp`'s requirements.
2857-
unsafe { memcmp(left, right, bytes).into() }
2858-
} else {
2859-
0
2860-
}
2861-
}

core/src/intrinsics/mir.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//!
1515
//! ```rust
1616
//! #![feature(core_intrinsics, custom_mir)]
17-
#![cfg_attr(not(bootstrap), doc = "#![allow(internal_features)]")]
17+
//! #![allow(internal_features)]
1818
//!
1919
//! use core::intrinsics::mir::*;
2020
//!
@@ -64,7 +64,7 @@
6464
//!
6565
//! ```rust
6666
//! #![feature(core_intrinsics, custom_mir)]
67-
#![cfg_attr(not(bootstrap), doc = "#![allow(internal_features)]")]
67+
//! #![allow(internal_features)]
6868
//!
6969
//! use core::intrinsics::mir::*;
7070
//!
@@ -318,7 +318,7 @@ define!(
318318
/// # Examples
319319
///
320320
/// ```rust
321-
#[cfg_attr(not(bootstrap), doc = "#![allow(internal_features)]")]
321+
/// #![allow(internal_features)]
322322
/// #![feature(custom_mir, core_intrinsics)]
323323
///
324324
/// use core::intrinsics::mir::*;

core/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@
9696
#![allow(explicit_outlives_requirements)]
9797
#![allow(incomplete_features)]
9898
#![warn(multiple_supertrait_upcastable)]
99-
#![cfg_attr(not(bootstrap), allow(internal_features))]
99+
#![allow(internal_features)]
100100
// Do not check link redundancy on bootstraping phase
101-
#![cfg_attr(not(bootstrap), allow(rustdoc::redundant_explicit_links))]
101+
#![allow(rustdoc::redundant_explicit_links)]
102102
//
103103
// Library features:
104104
// tidy-alphabetical-start

panic_abort/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#![feature(staged_api)]
1515
#![feature(rustc_attrs)]
1616
#![feature(c_unwind)]
17-
#![cfg_attr(not(bootstrap), allow(internal_features))]
17+
#![allow(internal_features)]
1818

1919
#[cfg(target_os = "android")]
2020
mod android;

panic_unwind/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@
1919
#![feature(panic_unwind)]
2020
#![feature(staged_api)]
2121
#![feature(std_internals)]
22-
#![cfg_attr(bootstrap, feature(abi_thiscall))]
2322
#![feature(rustc_attrs)]
2423
#![panic_runtime]
2524
#![feature(panic_runtime)]
2625
#![feature(c_unwind)]
2726
// `real_imp` is unused with Miri, so silence warnings.
2827
#![cfg_attr(miri, allow(dead_code))]
29-
#![cfg_attr(not(bootstrap), allow(internal_features))]
28+
#![allow(internal_features)]
3029

3130
use alloc::boxed::Box;
3231
use core::any::Any;

proc_macro/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#![feature(min_specialization)]
3333
#![feature(strict_provenance)]
3434
#![recursion_limit = "256"]
35-
#![cfg_attr(not(bootstrap), allow(internal_features))]
35+
#![allow(internal_features)]
3636

3737
#[unstable(feature = "proc_macro_internals", issue = "27812")]
3838
#[doc(hidden)]

profiler_builtins/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
issue = "none"
88
)]
99
#![allow(unused_features)]
10-
#![cfg_attr(not(bootstrap), allow(internal_features))]
10+
#![allow(internal_features)]
1111
#![feature(staged_api)]

0 commit comments

Comments
 (0)