From d158ef64e820041110bc5519abb9012010cc2cf0 Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro@pietroalbini.org>
Date: Thu, 17 Jan 2019 10:48:10 +0100
Subject: Revert "Auto merge of #57670 - rust-lang:beta-next,
 r=Mark-Simulacrum"

This reverts commit 722b4d695964906807b12379577bce5ee3d23e08, reversing
changes made to 956dba47d33fc8b2bdabcd50e5bfed264b570382.
---
 src/libcore/num/mod.rs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/libcore/num')

diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 3a3fd27d525..6827364c0f8 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -47,8 +47,6 @@ assert_eq!(size_of::<Option<std::num::", stringify!($Ty), ">>(), size_of::<", st
                 #[stable(feature = "nonzero", since = "1.28.0")]
                 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
                 #[repr(transparent)]
-                // FIXME: the rustc_layout_scalar_valid_range_start attr is marked as unused
-                #[cfg_attr(stage0, allow(unused_attributes))]
                 #[rustc_layout_scalar_valid_range_start(1)]
                 pub struct $Ty($Int);
             }
@@ -70,8 +68,6 @@ assert_eq!(size_of::<Option<std::num::", stringify!($Ty), ">>(), size_of::<", st
                 #[inline]
                 pub fn new(n: $Int) -> Option<Self> {
                     if n != 0 {
-                        // FIXME: this unsafe block is actually needed
-                        #[cfg_attr(stage0, allow(unused_unsafe))]
                         Some(unsafe { $Ty(n) })
                     } else {
                         None
-- 
cgit 1.4.1-3-g733a5