diff options
| author | bors <bors@rust-lang.org> | 2019-01-17 05:00:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-17 05:00:14 +0000 |
| commit | 722b4d695964906807b12379577bce5ee3d23e08 (patch) | |
| tree | b347115ede095d9266fb17f12a52ce980735cb8e /src/libcore/num | |
| parent | 956dba47d33fc8b2bdabcd50e5bfed264b570382 (diff) | |
| parent | b54a00accdadc9d98571050888dab701ca7bd2fd (diff) | |
| download | rust-722b4d695964906807b12379577bce5ee3d23e08.tar.gz rust-722b4d695964906807b12379577bce5ee3d23e08.zip | |
Auto merge of #57670 - rust-lang:beta-next, r=Mark-Simulacrum
Prepare beta 1.33.0 This PR includes the usual changes for a new beta, and suppresses a few lints on libcore: those lints are false positives caused by an internal attribute (`rustc_layout_scalar_valid_range_start`) and only happen on stage0. r? @Mark-Simulacrum
Diffstat (limited to 'src/libcore/num')
| -rw-r--r-- | src/libcore/num/mod.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 6827364c0f8..3a3fd27d525 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -47,6 +47,8 @@ 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); } @@ -68,6 +70,8 @@ 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 |