diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2015-12-17 13:48:44 +0100 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-12-17 13:48:44 +0100 |
| commit | 1e44ece42b26737dec9dd0b55303fc9f5103ddc8 (patch) | |
| tree | a5a2a09641d2051f2ba7eae12a3bd0ed52177258 | |
| parent | 4af427881405f95b8d87efea844cbd695fb55986 (diff) | |
| download | rust-1e44ece42b26737dec9dd0b55303fc9f5103ddc8.tar.gz rust-1e44ece42b26737dec9dd0b55303fc9f5103ddc8.zip | |
Don't import ParseResult's variants in dec2flt.
| -rw-r--r-- | src/libcore/num/dec2flt/mod.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libcore/num/dec2flt/mod.rs b/src/libcore/num/dec2flt/mod.rs index 9c0ec0f22c5..6acc621a613 100644 --- a/src/libcore/num/dec2flt/mod.rs +++ b/src/libcore/num/dec2flt/mod.rs @@ -96,8 +96,7 @@ use prelude::v1::*; use fmt; use str::FromStr; -use self::parse::{parse_decimal, Decimal, Sign}; -use self::parse::ParseResult::{Valid, Invalid, ShortcutToInf, ShortcutToZero}; +use self::parse::{parse_decimal, Decimal, Sign, ParseResult}; use self::num::digits_to_big; use self::rawfp::RawFloat; @@ -208,10 +207,10 @@ fn dec2flt<T: RawFloat>(s: &str) -> Result<T, ParseFloatError> { } let (sign, s) = extract_sign(s); let flt = match parse_decimal(s) { - Valid(decimal) => try!(convert(decimal)), - ShortcutToInf => T::infinity(), - ShortcutToZero => T::zero(), - Invalid => match s { + ParseResult::Valid(decimal) => try!(convert(decimal)), + ParseResult::ShortcutToInf => T::infinity(), + ParseResult::ShortcutToZero => T::zero(), + ParseResult::Invalid => match s { "inf" => T::infinity(), "NaN" => T::nan(), _ => { return Err(pfe_invalid()); } |
