diff options
| author | bors <bors@rust-lang.org> | 2013-05-03 08:15:38 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-03 08:15:38 -0700 |
| commit | d9c7d0bc938dd7a1d14e0d86fa0df439faa1ed3f (patch) | |
| tree | 500a48e6d3b69d8c32e349a0842bc5caa1c0b035 /src/libcore/num/float.rs | |
| parent | 213f7b24ccd9a6833af7e1a329c5e7ffc8f9e3d2 (diff) | |
| parent | e34a7ecbab8190560d50d4ccb21ffdae855b7c60 (diff) | |
| download | rust-d9c7d0bc938dd7a1d14e0d86fa0df439faa1ed3f.tar.gz rust-d9c7d0bc938dd7a1d14e0d86fa0df439faa1ed3f.zip | |
auto merge of #6185 : gifnksm/rust/prelude-from_str, r=graydon
`core::prelude` re-exports `core::to_str::ToStr`, but doesn't re-export `core::from_str::FromStr`. That is inconsistent.
Diffstat (limited to 'src/libcore/num/float.rs')
| -rw-r--r-- | src/libcore/num/float.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libcore/num/float.rs b/src/libcore/num/float.rs index b487fa48782..16bb2aa1286 100644 --- a/src/libcore/num/float.rs +++ b/src/libcore/num/float.rs @@ -20,7 +20,6 @@ // PORT this must match in width according to architecture -use from_str; use libc::c_int; use num::{Zero, One, strconv}; use prelude::*; @@ -289,7 +288,7 @@ pub fn from_str_radix(num: &str, radix: uint) -> Option<float> { strconv::ExpNone, false, false) } -impl from_str::FromStr for float { +impl FromStr for float { #[inline(always)] fn from_str(val: &str) -> Option<float> { from_str(val) } } |