diff options
| author | bors <bors@rust-lang.org> | 2015-10-21 09:28:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-21 09:28:37 +0000 |
| commit | e99a77f9b633838ee3aa3037e6e80d4e17e211a5 (patch) | |
| tree | a6b3bd3e8f9fdec6fc2a021c600ddde24b222f16 | |
| parent | 4aec7c7d618c44b5ed1b336a211507c105b644ab (diff) | |
| parent | 5fd98b3d795e11a27ba8f8b5d3d7b3418a12c2f8 (diff) | |
| download | rust-e99a77f9b633838ee3aa3037e6e80d4e17e211a5.tar.gz rust-e99a77f9b633838ee3aa3037e6e80d4e17e211a5.zip | |
Auto merge of #29108 - notriddle:master, r=alexcrichton
| -rw-r--r-- | src/libcore/num/mod.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 8b005b2f8ba..4b68591aa86 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -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), } } |
