mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert suggested use of unwrap_or

Browse source
This commit is contained in:
Benoît du Garreau 2021-10-03 22:56:34 +02:00
parent 70e55a8938
commit 4846fd92c0
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/core/src/num/int_macros.rs
View file

@ -885,7 +885,11 @@ macro_rules! int_impl {
#[inline] #[inline]
pub const fn saturating_add_unsigned(self, rhs: $UnsignedT) -> Self { pub const fn saturating_add_unsigned(self, rhs: $UnsignedT) -> Self {
// Overflow can only happen at the upper bound // Overflow can only happen at the upper bound
self.checked_add_unsigned(rhs).unwrap_or(Self::MAX) // We cannot use `unwrap_or` here because it is not `const`
match self.checked_add_unsigned(rhs) {
Some(x) => x,
None => Self::MAX,
}
} }
/// Saturating integer subtraction. Computes `self - rhs`, saturating at the /// Saturating integer subtraction. Computes `self - rhs`, saturating at the
@ -928,7 +932,11 @@ macro_rules! int_impl {
#[inline] #[inline]
pub const fn saturating_sub_unsigned(self, rhs: $UnsignedT) -> Self { pub const fn saturating_sub_unsigned(self, rhs: $UnsignedT) -> Self {
// Overflow can only happen at the lower bound // Overflow can only happen at the lower bound
self.checked_sub_unsigned(rhs).unwrap_or(Self::MIN) // We cannot use `unwrap_or` here because it is not `const`
match self.checked_sub_unsigned(rhs) {
Some(x) => x,
None => Self::MIN,
}
} }
/// Saturating integer negation. Computes `-self`, returning `MAX` if `self == MIN` /// Saturating integer negation. Computes `-self`, returning `MAX` if `self == MIN`