diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-02-14 12:54:15 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-02-14 19:26:41 -0800 |
| commit | 90311fc68fb484310df9ffc614e592dee30644ae (patch) | |
| tree | 6031108f4add627a78c23a4eb93a1f80ae26ec14 /src/libstd | |
| parent | 994747022a45b5c2b03f38dddbe8b43bf09679f3 (diff) | |
| download | rust-90311fc68fb484310df9ffc614e592dee30644ae.tar.gz rust-90311fc68fb484310df9ffc614e592dee30644ae.zip | |
Enable 64-bit checked multiplication on 32-bit
This was just waiting for compiler-rt support, which was added in #12027 Closes #8449
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/num/i64.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/u64.rs | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/libstd/num/i64.rs b/src/libstd/num/i64.rs index 2a91ee4dd71..3af082210b9 100644 --- a/src/libstd/num/i64.rs +++ b/src/libstd/num/i64.rs @@ -60,8 +60,6 @@ impl CheckedSub for i64 { } } -// FIXME: #8449: should not be disabled on 32-bit -#[cfg(target_word_size = "64")] impl CheckedMul for i64 { #[inline] fn checked_mul(&self, v: &i64) -> Option<i64> { diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs index c5510078e39..c9908dde6e0 100644 --- a/src/libstd/num/mod.rs +++ b/src/libstd/num/mod.rs @@ -426,7 +426,7 @@ pub trait Int: Integer + Bitwise + CheckedAdd + CheckedSub - // + CheckedMul // FIXME #8849: currently not impled on 32-bit + + CheckedMul + CheckedDiv {} /// Returns the smallest power of 2 greater than or equal to `n`. diff --git a/src/libstd/num/u64.rs b/src/libstd/num/u64.rs index a579e7ebbbe..17eebed967c 100644 --- a/src/libstd/num/u64.rs +++ b/src/libstd/num/u64.rs @@ -47,8 +47,6 @@ impl CheckedSub for u64 { } } -// FIXME: #8449: should not be disabled on 32-bit -#[cfg(target_word_size = "64")] impl CheckedMul for u64 { #[inline] fn checked_mul(&self, v: &u64) -> Option<u64> { |