Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 6 pull requests #37039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 8, 2016
Merged

Rollup of 6 pull requests #37039

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bbd0040
Fix documentation for `write!` on `std::fmt` page
wesleywiser Oct 6, 2016
9ca382f
Use workspaces and switch to a single Cargo.lock.
ahmedcharles Sep 2, 2016
32089ae
rustbuild: Fix dependencies of check-docs step
alexcrichton Oct 7, 2016
c66ae29
rewrite checked_{div,rem} to no contain any reference to panics
Oct 7, 2016
75c0d3f
Fix a typo in a comment describing gcc.rs's eh_frame_registry module
fitzgen Oct 7, 2016
0d1ab4e
Do not add an empty #[derive()] list in expand_derive (fixes #37033)
nox Oct 7, 2016
147e2da
rustbuild: Use `cargo metadata` to learn about DAG
alexcrichton Oct 7, 2016
1d20468
Rollup merge of #36937 - wesleywiser:patch-3, r=frewsxcv
Manishearth Oct 8, 2016
06c5bd5
Rollup merge of #37016 - alexcrichton:workspaces, r=japaric
Manishearth Oct 8, 2016
3e6cc82
Rollup merge of #37028 - alexcrichton:fix-deps, r=japaric
Manishearth Oct 8, 2016
73a9b8a
Rollup merge of #37029 - japaric:no-panics-in-checked-ops, r=alexcric…
Manishearth Oct 8, 2016
c1a19b8
Rollup merge of #37031 - fitzgen:typo-in-gcc-rs-comment, r=alexcrichton
Manishearth Oct 8, 2016
69f4126
Rollup merge of #37034 - nox:empty-trait-list, r=alexcrichton
Manishearth Oct 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/libcore/num/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,11 +516,10 @@ macro_rules! int_impl {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn checked_div(self, other: Self) -> Option<Self> {
if other == 0 {
if other == 0 || (self == Self::min_value() && other == -1) {
None
} else {
let (a, b) = self.overflowing_div(other);
if b {None} else {Some(a)}
Some(unsafe { intrinsics::unchecked_div(self, other) })
}
}

Expand All @@ -541,11 +540,10 @@ macro_rules! int_impl {
#[stable(feature = "wrapping", since = "1.7.0")]
#[inline]
pub fn checked_rem(self, other: Self) -> Option<Self> {
if other == 0 {
if other == 0 || (self == Self::min_value() && other == -1) {
None
} else {
let (a, b) = self.overflowing_rem(other);
if b {None} else {Some(a)}
Some(unsafe { intrinsics::unchecked_rem(self, other) })
}
}

Expand Down Expand Up @@ -1688,7 +1686,7 @@ macro_rules! uint_impl {
pub fn checked_div(self, other: Self) -> Option<Self> {
match other {
0 => None,
other => Some(self / other),
other => Some(unsafe { intrinsics::unchecked_div(self, other) }),
}
}

Expand All @@ -1709,7 +1707,7 @@ macro_rules! uint_impl {
if other == 0 {
None
} else {
Some(self % other)
Some(unsafe { intrinsics::unchecked_rem(self, other) })
}
}

Expand Down