diff options
| author | Oliver Middleton <olliemail27@gmail.com> | 2017-02-04 23:10:28 +0000 |
|---|---|---|
| committer | Oliver Middleton <olliemail27@gmail.com> | 2017-02-04 23:10:28 +0000 |
| commit | a2de6e22858a02cfcf6bfc18ff40ebb163ebb07c (patch) | |
| tree | 98e6bf845d7a6a22a17800285127164930f180b4 /src/libcore | |
| parent | eb5cb9545cfa4f1e90c92266b802edc4690f584a (diff) | |
| download | rust-a2de6e22858a02cfcf6bfc18ff40ebb163ebb07c.tar.gz rust-a2de6e22858a02cfcf6bfc18ff40ebb163ebb07c.zip | |
Fix TryFrom for i128/u128
Another case of `as` cast silent truncation being error prone. This also adds a few missing TryFrom tests to libcoretest.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/num/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index e907eae18bc..97ea6bb347b 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -2626,8 +2626,8 @@ macro_rules! cross_sign_from_int_impl { type Err = TryFromIntError; fn try_from(u: $unsigned) -> Result<$signed, TryFromIntError> { - let max = <$signed as FromStrRadixHelper>::max_value() as u64; - if u as u64 > max { + let max = <$signed as FromStrRadixHelper>::max_value() as u128; + if u as u128 > max { Err(TryFromIntError(())) } else { Ok(u as $signed) @@ -2640,8 +2640,8 @@ macro_rules! cross_sign_from_int_impl { type Err = TryFromIntError; fn try_from(u: $signed) -> Result<$unsigned, TryFromIntError> { - let max = <$unsigned as FromStrRadixHelper>::max_value() as u64; - if u < 0 || u as u64 > max { + let max = <$unsigned as FromStrRadixHelper>::max_value() as u128; + if u < 0 || u as u128 > max { Err(TryFromIntError(())) } else { Ok(u as $unsigned) |
