Skip to content

Commit 954fc71

Browse files
committed
Halloween... time to get rid of 👻
1 parent 02f9167 commit 954fc71

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

src/libcore/any.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,10 @@ impl TypeId {
426426
#[rustc_const_unstable(feature="const_type_id")]
427427
pub const fn of<T: ?Sized + 'static>() -> TypeId {
428428
TypeId {
429-
#[cfg(boostrap_stdarch_ignore_this)]
429+
#[cfg(bootstrap)]
430430
// SAFETY: going away soon
431431
t: unsafe { intrinsics::type_id::<T>() },
432-
#[cfg(not(boostrap_stdarch_ignore_this))]
432+
#[cfg(not(bootstrap))]
433433
t: intrinsics::type_id::<T>(),
434434
}
435435
}

src/libcore/iter/adapters/mod.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -517,14 +517,18 @@ impl<I> Iterator for StepBy<I> where I: Iterator {
517517
// overflow handling
518518
loop {
519519
let mul = n.checked_mul(step);
520-
#[cfg(boostrap_stdarch_ignore_this)]
521-
// SAFETY: going away soon
522-
if unsafe { intrinsics::likely(mul.is_some()) } {
523-
return self.iter.nth(mul.unwrap() - 1);
520+
#[cfg(bootstrap)]
521+
{
522+
// SAFETY: going away soon
523+
if unsafe { intrinsics::likely(mul.is_some()) } {
524+
return self.iter.nth(mul.unwrap() - 1);
525+
}
524526
}
525-
#[cfg(not(boostrap_stdarch_ignore_this))]
526-
if intrinsics::likely(mul.is_some()) {
527-
return self.iter.nth(mul.unwrap() - 1);
527+
#[cfg(not(bootstrap))]
528+
{
529+
if intrinsics::likely(mul.is_some()) {
530+
return self.iter.nth(mul.unwrap() - 1);
531+
}
528532
}
529533
let div_n = usize::MAX / n;
530534
let div_step = usize::MAX / step;

src/libcore/mem/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,10 @@ pub const fn size_of<T>() -> usize {
268268
#[inline]
269269
#[stable(feature = "rust1", since = "1.0.0")]
270270
pub fn size_of_val<T: ?Sized>(val: &T) -> usize {
271-
#[cfg(boostrap_stdarch_ignore_this)]
271+
#[cfg(bootstrap)]
272272
// SAFETY: going away soon
273273
unsafe { intrinsics::size_of_val(val) }
274-
#[cfg(not(boostrap_stdarch_ignore_this))]
274+
#[cfg(not(bootstrap))]
275275
intrinsics::size_of_val(val)
276276
}
277277

@@ -316,10 +316,10 @@ pub fn min_align_of<T>() -> usize {
316316
#[stable(feature = "rust1", since = "1.0.0")]
317317
#[rustc_deprecated(reason = "use `align_of_val` instead", since = "1.2.0")]
318318
pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {
319-
#[cfg(boostrap_stdarch_ignore_this)]
319+
#[cfg(bootstrap)]
320320
// SAFETY: going away soon
321321
unsafe { intrinsics::min_align_of_val(val) }
322-
#[cfg(not(boostrap_stdarch_ignore_this))]
322+
#[cfg(not(bootstrap))]
323323
intrinsics::min_align_of_val(val)
324324
}
325325

@@ -834,11 +834,11 @@ impl<T> fmt::Debug for Discriminant<T> {
834834
/// ```
835835
#[stable(feature = "discriminant_value", since = "1.21.0")]
836836
pub fn discriminant<T>(v: &T) -> Discriminant<T> {
837-
#[cfg(boostrap_stdarch_ignore_this)]
837+
#[cfg(bootstrap)]
838838
// SAFETY: going away soon
839839
unsafe {
840840
Discriminant(intrinsics::discriminant_value(v), PhantomData)
841841
}
842-
#[cfg(not(boostrap_stdarch_ignore_this))]
842+
#[cfg(not(bootstrap))]
843843
Discriminant(intrinsics::discriminant_value(v), PhantomData)
844844
}

0 commit comments

Comments
 (0)