Skip to content

Commit

Permalink
Revert suggested use of unwrap_or
Browse files Browse the repository at this point in the history
  • Loading branch information
a1phyr committed Oct 3, 2021
1 parent 70e55a8 commit 4846fd9
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions library/core/src/num/int_macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,11 @@ macro_rules! int_impl {
#[inline]
pub const fn saturating_add_unsigned(self, rhs: $UnsignedT) -> Self {
// 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
Expand Down Expand Up @@ -928,7 +932,11 @@ macro_rules! int_impl {
#[inline]
pub const fn saturating_sub_unsigned(self, rhs: $UnsignedT) -> Self {
// 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`
Expand Down

0 comments on commit 4846fd9

Please sign in to comment.