about summary refs log tree commit diff
path: root/src/libcore/mem
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2019-10-19 13:00:23 +0200
committerOliver Scherer <github35764891676564198441@oli-obk.de>2019-11-06 11:04:42 +0100
commit954fc719627cb608edee67cf2bf63547f7a31b05 (patch)
treed971539aaf9e4391caa0c4545fd6e9fada6f106b /src/libcore/mem
parent02f9167f94a06900ee555a5797081a44ebba009e (diff)
downloadrust-954fc719627cb608edee67cf2bf63547f7a31b05.tar.gz
rust-954fc719627cb608edee67cf2bf63547f7a31b05.zip
Halloween... time to get rid of 👻
Diffstat (limited to 'src/libcore/mem')
-rw-r--r--src/libcore/mem/mod.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs
index 7c504016c75..8e6fb253604 100644
--- a/src/libcore/mem/mod.rs
+++ b/src/libcore/mem/mod.rs
@@ -268,10 +268,10 @@ pub const fn size_of<T>() -> usize {
 #[inline]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn size_of_val<T: ?Sized>(val: &T) -> usize {
-    #[cfg(boostrap_stdarch_ignore_this)]
+    #[cfg(bootstrap)]
     // SAFETY: going away soon
     unsafe { intrinsics::size_of_val(val) }
-    #[cfg(not(boostrap_stdarch_ignore_this))]
+    #[cfg(not(bootstrap))]
     intrinsics::size_of_val(val)
 }
 
@@ -316,10 +316,10 @@ pub fn min_align_of<T>() -> usize {
 #[stable(feature = "rust1", since = "1.0.0")]
 #[rustc_deprecated(reason = "use `align_of_val` instead", since = "1.2.0")]
 pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {
-    #[cfg(boostrap_stdarch_ignore_this)]
+    #[cfg(bootstrap)]
     // SAFETY: going away soon
     unsafe { intrinsics::min_align_of_val(val) }
-    #[cfg(not(boostrap_stdarch_ignore_this))]
+    #[cfg(not(bootstrap))]
     intrinsics::min_align_of_val(val)
 }
 
@@ -834,11 +834,11 @@ impl<T> fmt::Debug for Discriminant<T> {
 /// ```
 #[stable(feature = "discriminant_value", since = "1.21.0")]
 pub fn discriminant<T>(v: &T) -> Discriminant<T> {
-    #[cfg(boostrap_stdarch_ignore_this)]
+    #[cfg(bootstrap)]
     // SAFETY: going away soon
     unsafe {
         Discriminant(intrinsics::discriminant_value(v), PhantomData)
     }
-    #[cfg(not(boostrap_stdarch_ignore_this))]
+    #[cfg(not(bootstrap))]
     Discriminant(intrinsics::discriminant_value(v), PhantomData)
 }