1
Fork 0

Stabilize the Saturating type (saturating_int_impl, gh-87920)

Also stabilizes saturating_int_assign_impl, gh-92354.

And also make pub fns const where the underlying saturating_*
fns became const in the meantime since the Saturating type was
created.
This commit is contained in:
Michael Watzko 2023-07-26 22:30:29 +02:00
parent 0eb41335e2
commit ad54426945
6 changed files with 94 additions and 103 deletions

View file

@ -144,7 +144,6 @@
#![feature(ptr_metadata)]
#![feature(ptr_sub_ptr)]
#![feature(receiver_trait)]
#![feature(saturating_int_impl)]
#![feature(set_ptr_value)]
#![feature(sized_type_properties)]
#![feature(slice_from_ptr_range)]

View file

@ -44,11 +44,10 @@ mod uint_macros; // import uint_impl!
mod error;
mod int_log10;
mod nonzero;
#[unstable(feature = "saturating_int_impl", issue = "87920")]
mod saturating;
mod wrapping;
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub use saturating::Saturating;
#[stable(feature = "rust1", since = "1.0.0")]
pub use wrapping::Wrapping;

View file

@ -24,7 +24,6 @@ use crate::ops::{Sub, SubAssign};
/// # Examples
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
/// let max = Saturating(u32::MAX);
@ -32,48 +31,50 @@ use crate::ops::{Sub, SubAssign};
///
/// assert_eq!(u32::MAX, (max + one).0);
/// ```
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default, Hash)]
#[repr(transparent)]
#[rustc_diagnostic_item = "Saturating"]
pub struct Saturating<T>(#[unstable(feature = "saturating_int_impl", issue = "87920")] pub T);
pub struct Saturating<T>(
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] pub T,
);
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl<T: fmt::Debug> fmt::Debug for Saturating<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
}
}
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl<T: fmt::Display> fmt::Display for Saturating<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
}
}
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl<T: fmt::Binary> fmt::Binary for Saturating<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
}
}
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl<T: fmt::Octal> fmt::Octal for Saturating<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
}
}
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl<T: fmt::LowerHex> fmt::LowerHex for Saturating<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
}
}
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl<T: fmt::UpperHex> fmt::UpperHex for Saturating<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
@ -209,7 +210,7 @@ impl<T: fmt::UpperHex> fmt::UpperHex for Saturating<T> {
// FIXME(30524): impl Op<T> for Saturating<T>, impl OpAssign<T> for Saturating<T>
macro_rules! saturating_impl {
($($t:ty)*) => ($(
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl Add for Saturating<$t> {
type Output = Saturating<$t>;
@ -219,9 +220,9 @@ macro_rules! saturating_impl {
}
}
forward_ref_binop! { impl Add, add for Saturating<$t>, Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl AddAssign for Saturating<$t> {
#[inline]
fn add_assign(&mut self, other: Saturating<$t>) {
@ -230,7 +231,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl AddAssign, add_assign for Saturating<$t>, Saturating<$t> }
#[unstable(feature = "saturating_int_assign_impl", issue = "92354")]
#[stable(feature = "saturating_int_assign_impl", since = "CURRENT_RUSTC_VERSION")]
impl AddAssign<$t> for Saturating<$t> {
#[inline]
fn add_assign(&mut self, other: $t) {
@ -239,7 +240,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl AddAssign, add_assign for Saturating<$t>, $t }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl Sub for Saturating<$t> {
type Output = Saturating<$t>;
@ -249,9 +250,9 @@ macro_rules! saturating_impl {
}
}
forward_ref_binop! { impl Sub, sub for Saturating<$t>, Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl SubAssign for Saturating<$t> {
#[inline]
fn sub_assign(&mut self, other: Saturating<$t>) {
@ -260,7 +261,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl SubAssign, sub_assign for Saturating<$t>, Saturating<$t> }
#[unstable(feature = "saturating_int_assign_impl", issue = "92354")]
#[stable(feature = "saturating_int_assign_impl", since = "CURRENT_RUSTC_VERSION")]
impl SubAssign<$t> for Saturating<$t> {
#[inline]
fn sub_assign(&mut self, other: $t) {
@ -269,7 +270,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl SubAssign, sub_assign for Saturating<$t>, $t }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl Mul for Saturating<$t> {
type Output = Saturating<$t>;
@ -279,9 +280,9 @@ macro_rules! saturating_impl {
}
}
forward_ref_binop! { impl Mul, mul for Saturating<$t>, Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl MulAssign for Saturating<$t> {
#[inline]
fn mul_assign(&mut self, other: Saturating<$t>) {
@ -290,7 +291,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl MulAssign, mul_assign for Saturating<$t>, Saturating<$t> }
#[unstable(feature = "saturating_int_assign_impl", issue = "92354")]
#[stable(feature = "saturating_int_assign_impl", since = "CURRENT_RUSTC_VERSION")]
impl MulAssign<$t> for Saturating<$t> {
#[inline]
fn mul_assign(&mut self, other: $t) {
@ -304,7 +305,6 @@ macro_rules! saturating_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert_eq!(Saturating(2", stringify!($t), "), Saturating(5", stringify!($t), ") / Saturating(2));")]
@ -313,12 +313,11 @@ macro_rules! saturating_impl {
/// ```
///
/// ```should_panic
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("let _ = Saturating(0", stringify!($t), ") / Saturating(0);")]
/// ```
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl Div for Saturating<$t> {
type Output = Saturating<$t>;
@ -328,10 +327,10 @@ macro_rules! saturating_impl {
}
}
forward_ref_binop! { impl Div, div for Saturating<$t>, Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl DivAssign for Saturating<$t> {
#[inline]
fn div_assign(&mut self, other: Saturating<$t>) {
@ -340,7 +339,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl DivAssign, div_assign for Saturating<$t>, Saturating<$t> }
#[unstable(feature = "saturating_int_assign_impl", issue = "92354")]
#[stable(feature = "saturating_int_assign_impl", since = "CURRENT_RUSTC_VERSION")]
impl DivAssign<$t> for Saturating<$t> {
#[inline]
fn div_assign(&mut self, other: $t) {
@ -349,7 +348,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl DivAssign, div_assign for Saturating<$t>, $t }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl Rem for Saturating<$t> {
type Output = Saturating<$t>;
@ -359,9 +358,9 @@ macro_rules! saturating_impl {
}
}
forward_ref_binop! { impl Rem, rem for Saturating<$t>, Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl RemAssign for Saturating<$t> {
#[inline]
fn rem_assign(&mut self, other: Saturating<$t>) {
@ -370,7 +369,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl RemAssign, rem_assign for Saturating<$t>, Saturating<$t> }
#[unstable(feature = "saturating_int_assign_impl", issue = "92354")]
#[stable(feature = "saturating_int_assign_impl", since = "CURRENT_RUSTC_VERSION")]
impl RemAssign<$t> for Saturating<$t> {
#[inline]
fn rem_assign(&mut self, other: $t) {
@ -379,7 +378,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl RemAssign, rem_assign for Saturating<$t>, $t }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl Not for Saturating<$t> {
type Output = Saturating<$t>;
@ -389,9 +388,9 @@ macro_rules! saturating_impl {
}
}
forward_ref_unop! { impl Not, not for Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl BitXor for Saturating<$t> {
type Output = Saturating<$t>;
@ -401,9 +400,9 @@ macro_rules! saturating_impl {
}
}
forward_ref_binop! { impl BitXor, bitxor for Saturating<$t>, Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl BitXorAssign for Saturating<$t> {
#[inline]
fn bitxor_assign(&mut self, other: Saturating<$t>) {
@ -412,7 +411,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl BitXorAssign, bitxor_assign for Saturating<$t>, Saturating<$t> }
#[unstable(feature = "saturating_int_assign_impl", issue = "92354")]
#[stable(feature = "saturating_int_assign_impl", since = "CURRENT_RUSTC_VERSION")]
impl BitXorAssign<$t> for Saturating<$t> {
#[inline]
fn bitxor_assign(&mut self, other: $t) {
@ -421,7 +420,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl BitXorAssign, bitxor_assign for Saturating<$t>, $t }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl BitOr for Saturating<$t> {
type Output = Saturating<$t>;
@ -431,9 +430,9 @@ macro_rules! saturating_impl {
}
}
forward_ref_binop! { impl BitOr, bitor for Saturating<$t>, Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl BitOrAssign for Saturating<$t> {
#[inline]
fn bitor_assign(&mut self, other: Saturating<$t>) {
@ -442,7 +441,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl BitOrAssign, bitor_assign for Saturating<$t>, Saturating<$t> }
#[unstable(feature = "saturating_int_assign_impl", issue = "92354")]
#[stable(feature = "saturating_int_assign_impl", since = "CURRENT_RUSTC_VERSION")]
impl BitOrAssign<$t> for Saturating<$t> {
#[inline]
fn bitor_assign(&mut self, other: $t) {
@ -451,7 +450,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl BitOrAssign, bitor_assign for Saturating<$t>, $t }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl BitAnd for Saturating<$t> {
type Output = Saturating<$t>;
@ -461,9 +460,9 @@ macro_rules! saturating_impl {
}
}
forward_ref_binop! { impl BitAnd, bitand for Saturating<$t>, Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl BitAndAssign for Saturating<$t> {
#[inline]
fn bitand_assign(&mut self, other: Saturating<$t>) {
@ -472,7 +471,7 @@ macro_rules! saturating_impl {
}
forward_ref_op_assign! { impl BitAndAssign, bitand_assign for Saturating<$t>, Saturating<$t> }
#[unstable(feature = "saturating_int_assign_impl", issue = "92354")]
#[stable(feature = "saturating_int_assign_impl", since = "CURRENT_RUSTC_VERSION")]
impl BitAndAssign<$t> for Saturating<$t> {
#[inline]
fn bitand_assign(&mut self, other: $t) {
@ -496,12 +495,11 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert_eq!(<Saturating<", stringify!($t), ">>::MIN, Saturating(", stringify!($t), "::MIN));")]
/// ```
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const MIN: Self = Self(<$t>::MIN);
/// Returns the largest value that can be represented by this integer type.
@ -511,12 +509,11 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert_eq!(<Saturating<", stringify!($t), ">>::MAX, Saturating(", stringify!($t), "::MAX));")]
/// ```
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const MAX: Self = Self(<$t>::MAX);
/// Returns the size of this integer type in bits.
@ -526,12 +523,11 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert_eq!(<Saturating<", stringify!($t), ">>::BITS, ", stringify!($t), "::BITS);")]
/// ```
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const BITS: u32 = <$t>::BITS;
/// Returns the number of ones in the binary representation of `self`.
@ -541,7 +537,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("let n = Saturating(0b01001100", stringify!($t), ");")]
@ -553,7 +548,8 @@ macro_rules! saturating_int_impl {
#[doc(alias = "popcnt")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn count_ones(self) -> u32 {
self.0.count_ones()
}
@ -565,7 +561,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert_eq!(Saturating(!0", stringify!($t), ").count_zeros(), 0);")]
@ -573,7 +568,8 @@ macro_rules! saturating_int_impl {
#[inline]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn count_zeros(self) -> u32 {
self.0.count_zeros()
}
@ -585,7 +581,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("let n = Saturating(0b0101000", stringify!($t), ");")]
@ -595,7 +590,8 @@ macro_rules! saturating_int_impl {
#[inline]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn trailing_zeros(self) -> u32 {
self.0.trailing_zeros()
}
@ -612,7 +608,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
/// let n: Saturating<i64> = Saturating(0x0123456789ABCDEF);
@ -623,7 +618,8 @@ macro_rules! saturating_int_impl {
#[inline]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn rotate_left(self, n: u32) -> Self {
Saturating(self.0.rotate_left(n))
}
@ -640,7 +636,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
/// let n: Saturating<i64> = Saturating(0x0123456789ABCDEF);
@ -651,7 +646,8 @@ macro_rules! saturating_int_impl {
#[inline]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn rotate_right(self, n: u32) -> Self {
Saturating(self.0.rotate_right(n))
}
@ -663,7 +659,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
/// let n: Saturating<i16> = Saturating(0b0000000_01010101);
@ -677,7 +672,8 @@ macro_rules! saturating_int_impl {
#[inline]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn swap_bytes(self) -> Self {
Saturating(self.0.swap_bytes())
}
@ -692,7 +688,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
/// let n = Saturating(0b0000000_01010101i16);
@ -704,8 +699,8 @@ macro_rules! saturating_int_impl {
/// assert_eq!(m, Saturating(-22016));
/// ```
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
pub const fn reverse_bits(self) -> Self {
@ -722,7 +717,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("let n = Saturating(0x1A", stringify!($t), ");")]
@ -735,7 +729,8 @@ macro_rules! saturating_int_impl {
/// ```
#[inline]
#[must_use]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn from_be(x: Self) -> Self {
Saturating(<$t>::from_be(x.0))
}
@ -750,7 +745,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("let n = Saturating(0x1A", stringify!($t), ");")]
@ -763,7 +757,8 @@ macro_rules! saturating_int_impl {
/// ```
#[inline]
#[must_use]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn from_le(x: Self) -> Self {
Saturating(<$t>::from_le(x.0))
}
@ -778,7 +773,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("let n = Saturating(0x1A", stringify!($t), ");")]
@ -790,7 +784,8 @@ macro_rules! saturating_int_impl {
/// }
/// ```
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
pub const fn to_be(self) -> Self {
@ -807,7 +802,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("let n = Saturating(0x1A", stringify!($t), ");")]
@ -819,7 +813,8 @@ macro_rules! saturating_int_impl {
/// }
/// ```
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
pub const fn to_le(self) -> Self {
@ -833,7 +828,6 @@ macro_rules! saturating_int_impl {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert_eq!(Saturating(3", stringify!($t), ").pow(4), Saturating(81));")]
@ -842,17 +836,17 @@ macro_rules! saturating_int_impl {
/// Results that are too large are saturated:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
/// assert_eq!(Saturating(3i8).pow(5), Saturating(127));
/// assert_eq!(Saturating(3i8).pow(6), Saturating(127));
/// ```
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
pub fn pow(self, exp: u32) -> Self {
pub const fn pow(self, exp: u32) -> Self {
Saturating(self.0.saturating_pow(exp))
}
}
@ -871,7 +865,6 @@ macro_rules! saturating_int_impl_signed {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("let n = Saturating(", stringify!($t), "::MAX >> 2);")]
@ -879,7 +872,8 @@ macro_rules! saturating_int_impl_signed {
/// assert_eq!(n.leading_zeros(), 3);
/// ```
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
pub const fn leading_zeros(self) -> u32 {
@ -894,7 +888,6 @@ macro_rules! saturating_int_impl_signed {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert_eq!(Saturating(100", stringify!($t), ").abs(), Saturating(100));")]
@ -904,10 +897,11 @@ macro_rules! saturating_int_impl_signed {
#[doc = concat!("assert_eq!(Saturating(", stringify!($t), "::MIN).abs(), Saturating(", stringify!($t), "::MAX));")]
/// ```
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
pub fn abs(self) -> Saturating<$t> {
pub const fn abs(self) -> Saturating<$t> {
Saturating(self.0.saturating_abs())
}
@ -922,7 +916,6 @@ macro_rules! saturating_int_impl_signed {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert_eq!(Saturating(10", stringify!($t), ").signum(), Saturating(1));")]
@ -930,10 +923,11 @@ macro_rules! saturating_int_impl_signed {
#[doc = concat!("assert_eq!(Saturating(-10", stringify!($t), ").signum(), Saturating(-1));")]
/// ```
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
pub fn signum(self) -> Saturating<$t> {
pub const fn signum(self) -> Saturating<$t> {
Saturating(self.0.signum())
}
@ -945,7 +939,6 @@ macro_rules! saturating_int_impl_signed {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert!(Saturating(10", stringify!($t), ").is_positive());")]
@ -953,7 +946,8 @@ macro_rules! saturating_int_impl_signed {
/// ```
#[must_use]
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn is_positive(self) -> bool {
self.0.is_positive()
}
@ -966,7 +960,6 @@ macro_rules! saturating_int_impl_signed {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert!(Saturating(-10", stringify!($t), ").is_negative());")]
@ -974,13 +967,14 @@ macro_rules! saturating_int_impl_signed {
/// ```
#[must_use]
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn is_negative(self) -> bool {
self.0.is_negative()
}
}
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
impl Neg for Saturating<$t> {
type Output = Self;
#[inline]
@ -989,7 +983,7 @@ macro_rules! saturating_int_impl_signed {
}
}
forward_ref_unop! { impl Neg, neg for Saturating<$t>,
#[unstable(feature = "saturating_int_impl", issue = "87920")] }
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")] }
)*)
}
@ -1005,7 +999,6 @@ macro_rules! saturating_int_impl_unsigned {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("let n = Saturating(", stringify!($t), "::MAX >> 2);")]
@ -1013,7 +1006,8 @@ macro_rules! saturating_int_impl_unsigned {
/// assert_eq!(n.leading_zeros(), 2);
/// ```
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[must_use = "this returns the result of the operation, \
without modifying the original"]
pub const fn leading_zeros(self) -> u32 {
@ -1027,7 +1021,6 @@ macro_rules! saturating_int_impl_unsigned {
/// Basic usage:
///
/// ```
/// #![feature(saturating_int_impl)]
/// use std::num::Saturating;
///
#[doc = concat!("assert!(Saturating(16", stringify!($t), ").is_power_of_two());")]
@ -1035,8 +1028,9 @@ macro_rules! saturating_int_impl_unsigned {
/// ```
#[must_use]
#[inline]
#[unstable(feature = "saturating_int_impl", issue = "87920")]
pub fn is_power_of_two(self) -> bool {
#[rustc_const_stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub const fn is_power_of_two(self) -> bool {
self.0.is_power_of_two()
}

View file

@ -351,7 +351,6 @@
#![feature(get_many_mut)]
#![feature(lazy_cell)]
#![feature(log_syntax)]
#![feature(saturating_int_impl)]
#![feature(stdsimd)]
#![feature(test)]
#![feature(trace_macros)]

View file

@ -12,7 +12,7 @@ mod tests;
#[cfg(test)]
mod benches;
#[unstable(feature = "saturating_int_impl", issue = "87920")]
#[stable(feature = "saturating_int_impl", since = "CURRENT_RUSTC_VERSION")]
pub use core::num::Saturating;
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::num::Wrapping;

View file

@ -10,7 +10,7 @@
arithmetic_overflow,
unconditional_panic
)]
#![feature(const_mut_refs, inline_const, saturating_int_impl)]
#![feature(const_mut_refs, inline_const)]
#![warn(clippy::arithmetic_side_effects)]
extern crate proc_macro_derive;