From ce034951fb907c8aa6abd5e6e04769e5e628953c Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Wed, 26 Sep 2018 14:26:46 -0700
Subject: Bump to 1.31.0 and bootstrap from 1.30 beta

---
 src/libcore/nonzero.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/libcore/nonzero.rs')

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);
-- 
cgit 1.4.1-3-g733a5