Skip to content

Commit 6f7d295

Browse files
benschulzPaul Mason
andauthored
Fix negation with overflow (paupino#657)
* Fix negation with overflow * Extend scope of tests to remove blindness --------- Co-authored-by: Paul Mason <paul@salsa.dev>
1 parent 913dc5b commit 6f7d295

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

src/decimal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1990,7 +1990,7 @@ impl FromPrimitive for Decimal {
19901990
unsigned = n as u128;
19911991
flags = 0;
19921992
} else {
1993-
unsigned = -n as u128;
1993+
unsigned = n.unsigned_abs();
19941994
flags = SIGN_MASK;
19951995
};
19961996
// Check if we overflow

tests/decimal_tests.rs

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2967,11 +2967,18 @@ fn it_converts_from_i128() {
29672967
(92233720368547758089, Some("92233720368547758089")),
29682968
(0xFFFF_FFFF_FFFF_FFFF_FFFF_FFFF, Some("79228162514264337593543950335")),
29692969
(0x7FFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF, None),
2970+
(i128::MIN, None),
2971+
(i128::MAX, None),
29702972
];
29712973
for (value, expected) in tests {
2972-
if let Some(expected_value) = expected {
2973-
let decimal = Decimal::from_str(expected_value).unwrap();
2974-
assert_eq!(num_traits::FromPrimitive::from_i128(*value), Some(decimal));
2974+
let from_i128 = num_traits::FromPrimitive::from_i128(*value);
2975+
2976+
match expected {
2977+
Some(expected_value) => {
2978+
let decimal = Decimal::from_str(expected_value).unwrap();
2979+
assert_eq!(from_i128, Some(decimal));
2980+
}
2981+
None => assert!(from_i128.is_none()),
29752982
}
29762983
}
29772984
}
@@ -2983,11 +2990,17 @@ fn it_converts_from_u128() {
29832990
(0xFFFF_FFFF_FFFF_FFFF, Some("18446744073709551615")),
29842991
(0xFFFF_FFFF_FFFF_FFFF_FFFF_FFFF, Some("79228162514264337593543950335")),
29852992
(0x7FFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF_FFFF, None),
2993+
(u128::MAX, None),
29862994
];
29872995
for (value, expected) in tests {
2988-
if let Some(expected_value) = expected {
2989-
let decimal = Decimal::from_str(expected_value).unwrap();
2990-
assert_eq!(num_traits::FromPrimitive::from_u128(*value), Some(decimal));
2996+
let from_u128 = num_traits::FromPrimitive::from_u128(*value);
2997+
2998+
match expected {
2999+
Some(expected_value) => {
3000+
let decimal = Decimal::from_str(expected_value).unwrap();
3001+
assert_eq!(from_u128, Some(decimal));
3002+
}
3003+
None => assert!(from_u128.is_none()),
29913004
}
29923005
}
29933006
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy