about summary refs log tree commit diff
path: root/src/libcore/nonzero.rs
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2018-09-26 14:26:46 -0700
committerJosh Stone <jistone@redhat.com>2018-09-27 20:52:53 -0700
commitce034951fb907c8aa6abd5e6e04769e5e628953c (patch)
tree94468d8a5108315f82993dd95328270aefd3e2ec /src/libcore/nonzero.rs
parent7d52cbce6db83e4fc2d8706b4e4b9c7da76cbcf8 (diff)
downloadrust-ce034951fb907c8aa6abd5e6e04769e5e628953c.tar.gz
rust-ce034951fb907c8aa6abd5e6e04769e5e628953c.zip
Bump to 1.31.0 and bootstrap from 1.30 beta
Diffstat (limited to 'src/libcore/nonzero.rs')
-rw-r--r--src/libcore/nonzero.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libcore/nonzero.rs b/src/libcore/nonzero.rs
index 30067d7e163..118e75e1ee7 100644
--- a/src/libcore/nonzero.rs
+++ b/src/libcore/nonzero.rs
@@ -14,8 +14,7 @@ use ops::CoerceUnsized;
 
 /// A wrapper type for raw pointers and integers that will never be
 /// NULL or 0 that might allow certain optimizations.
-#[cfg_attr(stage0, lang = "non_zero")]
-#[cfg_attr(not(stage0), rustc_layout_scalar_valid_range_start(1))]
+#[rustc_layout_scalar_valid_range_start(1)]
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[repr(transparent)]
 pub(crate) struct NonZero<T>(pub(crate) T);