diff options
| author | bors <bors@rust-lang.org> | 2013-04-23 11:30:54 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-04-23 11:30:54 -0700 |
| commit | d9896d592b4af23e9a8e8893de77c99cbb85b2c2 (patch) | |
| tree | 05318a49df80cccac74e1497dccb39a198b1fe55 | |
| parent | 88ccee78a812b142a9f0d3d24d78bf6b5e190403 (diff) | |
| parent | b813d68abe84e0e30c6138219a3f9f23e8f5d9de (diff) | |
| download | rust-d9896d592b4af23e9a8e8893de77c99cbb85b2c2.tar.gz rust-d9896d592b4af23e9a8e8893de77c99cbb85b2c2.zip | |
auto merge of #6028 : Kimundi/rust/strconv-test-fixup, r=brson
r? @brson Can't test atm, but it probably failed because of 32bit float precision loss of the float literal.
| -rw-r--r-- | src/libcore/num/strconv.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libcore/num/strconv.rs b/src/libcore/num/strconv.rs index 8d050e65c98..2f3cd92dac0 100644 --- a/src/libcore/num/strconv.rs +++ b/src/libcore/num/strconv.rs @@ -655,7 +655,6 @@ mod test { use option::*; #[test] - #[ignore(reason = "fails in x86")] fn from_str_ignore_underscores() { let s : Option<u8> = from_str_common("__1__", 2, false, false, false, ExpNone, false, true); @@ -665,9 +664,9 @@ mod test { ExpNone, false, false); assert_eq!(n, None); - let f : Option<f32> = from_str_common("_1_._1_e_1_", 10, false, true, false, + let f : Option<f32> = from_str_common("_1_._5_e_1_", 10, false, true, false, ExpDec, false, true); - assert_eq!(f, Some(1.1e1f32)); + assert_eq!(f, Some(1.5e1f32)); } #[test] |