bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove unstable deprecated num::NonZeroI* types

Browse source
This commit is contained in:
Simon Sapin 2018-03-24 11:36:29 +01:00
parent ee85bfdcc2
commit c536639c1e
2 changed files with 2 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libcore/num/mod.rs
View file

@ -24,7 +24,6 @@ macro_rules! impl_nonzero_fmt {
( #[$stability: meta] ( $( $Trait: ident ),+ ) for $Ty: ident ) => { ( #[$stability: meta] ( $( $Trait: ident ),+ ) for $Ty: ident ) => {
$( $(
#[$stability] #[$stability]
#[allow(deprecated)]
impl fmt::$Trait for $Ty { impl fmt::$Trait for $Ty {
#[inline] #[inline]
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
@ -36,7 +35,7 @@ macro_rules! impl_nonzero_fmt {
} }
macro_rules! nonzero_integers { macro_rules! nonzero_integers {
( #[$stability: meta] #[$deprecation: meta] $( $Ty: ident($Int: ty); )+ ) => { ( #[$stability: meta] $( $Ty: ident($Int: ty); )+ ) => {
$( $(
/// An integer that is known not to equal zero. /// An integer that is known not to equal zero.
/// ///
@ -48,7 +47,6 @@ macro_rules! nonzero_integers {
/// assert_eq!(size_of::<Option<std::num::NonZeroU32>>(), size_of::<u32>()); /// assert_eq!(size_of::<Option<std::num::NonZeroU32>>(), size_of::<u32>());
/// ``` /// ```
#[$stability] #[$stability]
#[$deprecation]
#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)] #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
pub struct $Ty(NonZero<$Int>); pub struct $Ty(NonZero<$Int>);
@ -94,7 +92,6 @@ macro_rules! nonzero_integers {
nonzero_integers! { nonzero_integers! {
#[unstable(feature = "nonzero", issue = "49137")] #[unstable(feature = "nonzero", issue = "49137")]
#[allow(deprecated)] // Redundant, works around "error: inconsistent lockstep iteration"
NonZeroU8(u8); NonZeroU8(u8);
NonZeroU16(u16); NonZeroU16(u16);
NonZeroU32(u32); NonZeroU32(u32);
@ -103,19 +100,6 @@ nonzero_integers! {
NonZeroUsize(usize); NonZeroUsize(usize);
} }
nonzero_integers! {
#[unstable(feature = "nonzero", issue = "49137")]
#[rustc_deprecated(since = "1.26.0", reason = "\
signed non-zero integers are considered for removal due to lack of known use cases. \
If you’re using them, please comment on https://github.com/rust-lang/rust/issues/49137")]
NonZeroI8(i8);
NonZeroI16(i16);
NonZeroI32(i32);
NonZeroI64(i64);
NonZeroI128(i128);
NonZeroIsize(isize);
}
/// Provides intentionally-wrapped arithmetic on `T`. /// Provides intentionally-wrapped arithmetic on `T`.
/// ///
/// Operations like `+` on `u32` values is intended to never overflow, /// Operations like `+` on `u32` values is intended to never overflow,

5
src/libstd/num.rs
View file

@ -23,10 +23,7 @@ pub use core::num::Wrapping;
#[unstable(feature = "nonzero", issue = "49137")] #[unstable(feature = "nonzero", issue = "49137")]
#[allow(deprecated)] #[allow(deprecated)]
pub use core::num::{ pub use core::num::{NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU128, NonZeroUsize};
NonZeroU8, NonZeroI8, NonZeroU16, NonZeroI16, NonZeroU32, NonZeroI32,
NonZeroU64, NonZeroI64, NonZeroU128, NonZeroI128, NonZeroUsize, NonZeroIsize,
};
#[cfg(test)] use fmt; #[cfg(test)] use fmt;
#[cfg(test)] use ops::{Add, Sub, Mul, Div, Rem}; #[cfg(test)] use ops::{Add, Sub, Mul, Div, Rem};