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

Commit dbf8155

Browse files
committed
remove cfg bootstrap from library tree
Signed-off-by: onur-ozkan <work@onurozkan.dev>
1 parent 32867b9 commit dbf8155

File tree

9 files changed

+5
-63
lines changed

9 files changed

+5
-63
lines changed

library/core/src/clone.rs

Lines changed: 1 addition & 1 deletion
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
}

library/core/src/fmt/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,9 +1501,6 @@ unsafe fn run(fmt: &mut Formatter<'_>, arg: &rt::Placeholder, args: &[rt::Argume
15011501

15021502
unsafe fn getcount(args: &[rt::Argument<'_>], cnt: &rt::Count) -> Option<u16> {
15031503
match *cnt {
1504-
#[cfg(bootstrap)]
1505-
rt::Count::Is(n) => Some(n as u16),
1506-
#[cfg(not(bootstrap))]
15071504
rt::Count::Is(n) => Some(n),
15081505
rt::Count::Implied => None,
15091506
rt::Count::Param(i) => {

library/core/src/fmt/rt.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ pub enum Alignment {
4747
#[derive(Copy, Clone)]
4848
pub enum Count {
4949
/// Specified with a literal number, stores the value
50-
#[cfg(bootstrap)]
51-
Is(usize),
52-
/// Specified with a literal number, stores the value
53-
#[cfg(not(bootstrap))]
5450
Is(u16),
5551
/// Specified using `$` and `*` syntaxes, stores the index into `args`
5652
Param(usize),

library/core/src/intrinsics/mod.rs

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,41 +2149,17 @@ pub unsafe fn truncf128(x: f128) -> f128;
21492149
/// [`f16::round_ties_even`](../../std/primitive.f16.html#method.round_ties_even)
21502150
#[rustc_intrinsic]
21512151
#[rustc_nounwind]
2152-
#[cfg(not(bootstrap))]
21532152
pub fn round_ties_even_f16(x: f16) -> f16;
21542153

2155-
/// To be removed on next bootstrap bump.
2156-
#[cfg(bootstrap)]
2157-
pub fn round_ties_even_f16(x: f16) -> f16 {
2158-
#[rustc_intrinsic]
2159-
#[rustc_nounwind]
2160-
unsafe fn rintf16(x: f16) -> f16;
2161-
2162-
// SAFETY: this intrinsic isn't actually unsafe
2163-
unsafe { rintf16(x) }
2164-
}
2165-
21662154
/// Returns the nearest integer to an `f32`. Rounds half-way cases to the number with an even
21672155
/// least significant digit.
21682156
///
21692157
/// The stabilized version of this intrinsic is
21702158
/// [`f32::round_ties_even`](../../std/primitive.f32.html#method.round_ties_even)
21712159
#[rustc_intrinsic]
21722160
#[rustc_nounwind]
2173-
#[cfg(not(bootstrap))]
21742161
pub fn round_ties_even_f32(x: f32) -> f32;
21752162

2176-
/// To be removed on next bootstrap bump.
2177-
#[cfg(bootstrap)]
2178-
pub fn round_ties_even_f32(x: f32) -> f32 {
2179-
#[rustc_intrinsic]
2180-
#[rustc_nounwind]
2181-
unsafe fn rintf32(x: f32) -> f32;
2182-
2183-
// SAFETY: this intrinsic isn't actually unsafe
2184-
unsafe { rintf32(x) }
2185-
}
2186-
21872163
/// Provided for compatibility with stdarch. DO NOT USE.
21882164
#[inline(always)]
21892165
pub unsafe fn rintf32(x: f32) -> f32 {
@@ -2197,20 +2173,8 @@ pub unsafe fn rintf32(x: f32) -> f32 {
21972173
/// [`f64::round_ties_even`](../../std/primitive.f64.html#method.round_ties_even)
21982174
#[rustc_intrinsic]
21992175
#[rustc_nounwind]
2200-
#[cfg(not(bootstrap))]
22012176
pub fn round_ties_even_f64(x: f64) -> f64;
22022177

2203-
/// To be removed on next bootstrap bump.
2204-
#[cfg(bootstrap)]
2205-
pub fn round_ties_even_f64(x: f64) -> f64 {
2206-
#[rustc_intrinsic]
2207-
#[rustc_nounwind]
2208-
unsafe fn rintf64(x: f64) -> f64;
2209-
2210-
// SAFETY: this intrinsic isn't actually unsafe
2211-
unsafe { rintf64(x) }
2212-
}
2213-
22142178
/// Provided for compatibility with stdarch. DO NOT USE.
22152179
#[inline(always)]
22162180
pub unsafe fn rintf64(x: f64) -> f64 {
@@ -2224,20 +2188,8 @@ pub unsafe fn rintf64(x: f64) -> f64 {
22242188
/// [`f128::round_ties_even`](../../std/primitive.f128.html#method.round_ties_even)
22252189
#[rustc_intrinsic]
22262190
#[rustc_nounwind]
2227-
#[cfg(not(bootstrap))]
22282191
pub fn round_ties_even_f128(x: f128) -> f128;
22292192

2230-
/// To be removed on next bootstrap bump.
2231-
#[cfg(bootstrap)]
2232-
pub fn round_ties_even_f128(x: f128) -> f128 {
2233-
#[rustc_intrinsic]
2234-
#[rustc_nounwind]
2235-
unsafe fn rintf128(x: f128) -> f128;
2236-
2237-
// SAFETY: this intrinsic isn't actually unsafe
2238-
unsafe { rintf128(x) }
2239-
}
2240-
22412193
/// Returns the nearest integer to an `f16`. Rounds half-way cases away from zero.
22422194
///
22432195
/// The stabilized version of this intrinsic is

library/core/src/macros/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,6 @@ pub(crate) mod builtin {
17531753
reason = "`type_alias_impl_trait` has open design concerns"
17541754
)]
17551755
#[rustc_builtin_macro]
1756-
#[cfg(not(bootstrap))]
17571756
pub macro define_opaque($($tt:tt)*) {
17581757
/* compiler built-in */
17591758
}

library/core/src/pat.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ macro_rules! pattern_type {
2525
)]
2626
pub trait RangePattern {
2727
/// Trait version of the inherent `MIN` assoc const.
28-
#[cfg_attr(not(bootstrap), lang = "RangeMin")]
28+
#[lang = "RangeMin"]
2929
const MIN: Self;
3030

3131
/// Trait version of the inherent `MIN` assoc const.
32-
#[cfg_attr(not(bootstrap), lang = "RangeMax")]
32+
#[lang = "RangeMax"]
3333
const MAX: Self;
3434

3535
/// A compile-time helper to subtract 1 for exclusive ranges.
36-
#[cfg_attr(not(bootstrap), lang = "RangeSub")]
36+
#[lang = "RangeSub"]
3737
#[track_caller]
3838
fn sub_one(self) -> Self;
3939
}

library/core/src/prelude/v1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,4 @@ pub use crate::macros::builtin::deref;
117117
issue = "63063",
118118
reason = "`type_alias_impl_trait` has open design concerns"
119119
)]
120-
#[cfg(not(bootstrap))]
121120
pub use crate::macros::builtin::define_opaque;

library/std/src/backtrace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ mod helper {
432432
use super::*;
433433
pub(super) type LazyResolve = impl (FnOnce() -> Capture) + Send + Sync + UnwindSafe;
434434

435-
#[cfg_attr(not(bootstrap), define_opaque(LazyResolve))]
435+
#[define_opaque(LazyResolve)]
436436
pub(super) fn lazy_resolve(mut capture: Capture) -> LazyResolve {
437437
move || {
438438
// Use the global backtrace lock to synchronize this as it's a

library/std/src/prelude/v1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ pub use core::prelude::v1::deref;
109109
issue = "63063",
110110
reason = "`type_alias_impl_trait` has open design concerns"
111111
)]
112-
#[cfg(not(bootstrap))]
113112
pub use core::prelude::v1::define_opaque;
114113

115114
// The file so far is equivalent to core/src/prelude/v1.rs. It is duplicated

0 commit comments

Comments
 (0)