user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #29108 - notriddle:master, r=alexcrichton

Browse source
This commit is contained in:
bors 2015-10-21 09:28:37 +00:00
commit e99a77f9b6
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -404,12 +404,12 @@ macro_rules! int_impl {
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn checked_div(self, v: Self) -> Option<Self> {
match v {
0 => None,
pub fn checked_div(self, other: Self) -> Option<Self> {
match other {
0 => None,
-1 if self == Self::min_value()
=> None,
v => Some(self / v),
=> None,
other => Some(self / other),
}
}
@ -973,10 +973,10 @@ macro_rules! uint_impl {
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn checked_div(self, v: Self) -> Option<Self> {
match v {
pub fn checked_div(self, other: Self) -> Option<Self> {
match other {
0 => None,
v => Some(self / v),
other => Some(self / other),
}
}