rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix TryFrom for i128/u128

Browse Source 
Another case of `as` cast silent truncation being error prone.

This also adds a few missing TryFrom tests to libcoretest.
This commit is contained in:
Oliver Middleton
2017-02-04 23:10:28 +00:00
parent eb5cb9545c
commit a2de6e2285
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcore/num/mod.rs
View File

@@ -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)