diff options
| author | Mark Mansi <markm@cs.wisc.edu> | 2018-03-24 18:19:33 -0500 |
|---|---|---|
| committer | Mark Mansi <markm@cs.wisc.edu> | 2018-03-26 08:37:56 -0500 |
| commit | 140bf949bf65bb0479dbe31bd3474d5546ef59e1 (patch) | |
| tree | b1fd9e07343006c54caec57f1a57ff3fef0967a6 | |
| parent | 6b625b334155aabebeca87c49689d38ffe8aa700 (diff) | |
| download | rust-140bf949bf65bb0479dbe31bd3474d5546ef59e1.tar.gz rust-140bf949bf65bb0479dbe31bd3474d5546ef59e1.zip | |
fix last two tidy
| -rw-r--r-- | src/libcore/num/mod.rs | 8 | ||||
| -rw-r--r-- | src/libstd/num.rs | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 55186b0a3ac..a5ba0bcdf7e 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -97,14 +97,8 @@ nonzero_integers! { NonZeroU16(u16); NonZeroI16(i16); NonZeroU32(u32); NonZeroI32(i32); NonZeroU64(u64); NonZeroI64(i64); - NonZeroUsize(usize); NonZeroIsize(isize); -} - -nonzero_integers! { - // Change this to `#[unstable(feature = "i128", issue = "35118")]` - // if other NonZero* integer types are stabilizied before 128-bit integers - #[unstable(feature = "nonzero", issue = "49137")] NonZeroU128(u128); NonZeroI128(i128); + NonZeroUsize(usize); NonZeroIsize(isize); } /// Provides intentionally-wrapped arithmetic on `T`. diff --git a/src/libstd/num.rs b/src/libstd/num.rs index 6f537fd5c50..547b8c7c925 100644 --- a/src/libstd/num.rs +++ b/src/libstd/num.rs @@ -24,14 +24,9 @@ pub use core::num::Wrapping; #[unstable(feature = "nonzero", issue = "49137")] pub use core::num::{ NonZeroU8, NonZeroI8, NonZeroU16, NonZeroI16, NonZeroU32, NonZeroI32, - NonZeroU64, NonZeroI64, NonZeroUsize, NonZeroIsize, + NonZeroU64, NonZeroI64, NonZeroU128, NonZeroI128, NonZeroUsize, NonZeroIsize, }; -// Change this to `#[unstable(feature = "i128", issue = "35118")]` -// if other NonZero* integer types are stabilizied before 128-bit integers -#[unstable(feature = "nonzero", issue = "49137")] -pub use core::num::{NonZeroU128, NonZeroI128}; - #[cfg(test)] use fmt; #[cfg(test)] use ops::{Add, Sub, Mul, Div, Rem}; |
