bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #112644 - zica87:nonZeroTypes, r=Mark-Simulacrum

Browse source 
Correct types in method descriptions of `NonZero*` types

- `$Int`: e.g. i32, usize
- `$Ty`: e.g. NonZeroI32, NonZeroUsize

|method|current description|after my changes|
|-|-|-|
|`saturating_add`|...Return `$Int`::MAX on overflow.|...Return `$Ty`::MAX on overflow.|
|`checked_abs`|...returns None if self == `$Int`::MIN.|...returns None if self == `$Ty`::MIN.|
|`checked_neg`|...returning None if self == i32::MIN.|...returning None if self == `$Ty`::MIN.|
|`saturating_neg`|...returning MAX if self == i32::MIN...|...returning `$Ty`::MAX if self == `$Ty`::MIN...|
|`saturating_mul`|...Return `$Int`::MAX...|...Return `$Ty`::MAX...|
|`saturating_pow`|...Return `$Int`::MIN or `$Int`::MAX...|...Return `$Ty`::MIN or `$Ty`::MAX...|

---

For example:

```rust
pub const fn saturating_neg(self) -> NonZeroI128
```

- current
  - Saturating negation. Computes `-self`, returning `MAX` if `self == i32::MIN` instead of overflowing.
- after my changes
  - Saturating negation. Computes `-self`, returning `NonZeroI128::MAX` if `self == NonZeroI128::MIN` instead of overflowing.
This commit is contained in:
Matthias Krüger 2023-06-17 12:43:30 +02:00 • committed by GitHub
commit ba3e535c07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
library/core/src/num/nonzero.rs
View file

@ -348,7 +348,7 @@ macro_rules! nonzero_unsigned_operations {
} }
/// Adds an unsigned integer to a non-zero value. /// Adds an unsigned integer to a non-zero value.
#[doc = concat!("Return [`", stringify!($Int), "::MAX`] on overflow.")] #[doc = concat!("Return [`", stringify!($Ty), "::MAX`] on overflow.")]
/// ///
/// # Examples /// # Examples
/// ///
@ -579,7 +579,7 @@ macro_rules! nonzero_signed_operations {
/// Checked absolute value. /// Checked absolute value.
/// Checks for overflow and returns [`None`] if /// Checks for overflow and returns [`None`] if
#[doc = concat!("`self == ", stringify!($Int), "::MIN`.")] #[doc = concat!("`self == ", stringify!($Ty), "::MIN`.")]
/// The result cannot be zero. /// The result cannot be zero.
/// ///
/// # Example /// # Example
@ -800,7 +800,8 @@ macro_rules! nonzero_signed_operations {
self.get().is_negative() self.get().is_negative()
} }
/// Checked negation. Computes `-self`, returning `None` if `self == i32::MIN`. /// Checked negation. Computes `-self`,
#[doc = concat!("returning `None` if `self == ", stringify!($Ty), "::MIN`.")]
/// ///
/// # Example /// # Example
/// ///
@ -859,8 +860,10 @@ macro_rules! nonzero_signed_operations {
((unsafe { $Ty::new_unchecked(result) }), overflow) ((unsafe { $Ty::new_unchecked(result) }), overflow)
} }
/// Saturating negation. Computes `-self`, returning `MAX` if /// Saturating negation. Computes `-self`,
/// `self == i32::MIN` instead of overflowing. #[doc = concat!("returning [`", stringify!($Ty), "::MAX`]")]
#[doc = concat!("if `self == ", stringify!($Ty), "::MIN`")]
/// instead of overflowing.
/// ///
/// # Example /// # Example
/// ///
@ -993,7 +996,7 @@ macro_rules! nonzero_unsigned_signed_operations {
} }
/// Multiplies two non-zero integers together. /// Multiplies two non-zero integers together.
#[doc = concat!("Return [`", stringify!($Int), "::MAX`] on overflow.")] #[doc = concat!("Return [`", stringify!($Ty), "::MAX`] on overflow.")]
/// ///
/// # Examples /// # Examples
/// ///
@ -1102,11 +1105,11 @@ macro_rules! nonzero_unsigned_signed_operations {
#[doc = sign_dependent_expr!{ #[doc = sign_dependent_expr!{
$signedness ? $signedness ?
if signed { if signed {
concat!("Return [`", stringify!($Int), "::MIN`] ", concat!("Return [`", stringify!($Ty), "::MIN`] ",
"or [`", stringify!($Int), "::MAX`] on overflow.") "or [`", stringify!($Ty), "::MAX`] on overflow.")
} }
if unsigned { if unsigned {
concat!("Return [`", stringify!($Int), "::MAX`] on overflow.") concat!("Return [`", stringify!($Ty), "::MAX`] on overflow.")
} }
}] }]
/// ///