diff --git a/src/libcollections/hashmap.rs b/src/libcollections/hashmap.rs index 877f2b3000970..357ddb33b53f1 100644 --- a/src/libcollections/hashmap.rs +++ b/src/libcollections/hashmap.rs @@ -53,6 +53,7 @@ //! ``` use std::cmp::max; +use std::default::Default; use std::fmt; use std::hash::{Hash, Hasher, sip}; use std::iter::{FilterMap, Chain, Repeat, Zip}; diff --git a/src/libextra/url.rs b/src/libextra/url.rs index 0292a18817ccd..5812aaa5038d0 100644 --- a/src/libextra/url.rs +++ b/src/libextra/url.rs @@ -16,6 +16,7 @@ use std::cmp::Eq; use std::fmt; use std::hash::{Hash, sip}; use std::io::BufReader; +use std::from_str::FromStr; use std::uint; use collections::HashMap; diff --git a/src/libnum/bigint.rs b/src/libnum/bigint.rs index 894b3794581e1..63f48ea9d222f 100644 --- a/src/libnum/bigint.rs +++ b/src/libnum/bigint.rs @@ -20,6 +20,7 @@ use Integer; use std::cmp; use std::fmt; +use std::from_str::FromStr; use std::num::{Bitwise, ToPrimitive, FromPrimitive}; use std::num::{Zero, One, ToStrRadix, FromStrRadix}; use std::rand::Rng; @@ -1397,8 +1398,9 @@ mod biguint_tests { use super::{Plus, BigInt, RandBigInt, ToBigInt}; use std::cmp::{Less, Equal, Greater}; + use std::from_str::FromStr; use std::i64; - use std::num::{Zero, One, FromStrRadix}; + use std::num::{Zero, One, FromStrRadix, ToStrRadix}; use std::num::{ToPrimitive, FromPrimitive}; use std::rand::{task_rng}; use std::str; @@ -2056,7 +2058,7 @@ mod bigint_tests { use std::cmp::{Less, Equal, Greater}; use std::i64; - use std::num::{Zero, One, FromStrRadix}; + use std::num::{Zero, One, FromStrRadix, ToStrRadix}; use std::num::{ToPrimitive, FromPrimitive}; use std::rand::{task_rng}; use std::u64; diff --git a/src/libnum/rational.rs b/src/libnum/rational.rs index 44a916c5d4e22..79ff54cb90c68 100644 --- a/src/libnum/rational.rs +++ b/src/libnum/rational.rs @@ -333,7 +333,7 @@ impl mod test { use super::{Ratio, Rational, BigRational}; - use std::num::{Zero,One,FromStrRadix,FromPrimitive}; + use std::num::{Zero, One, FromStrRadix, FromPrimitive, ToStrRadix}; use std::from_str::FromStr; pub static _0 : Rational = Ratio { numer: 0, denom: 1}; diff --git a/src/libstd/bool.rs b/src/libstd/bool.rs index 918d42e1bce46..2376603fcc8f9 100644 --- a/src/libstd/bool.rs +++ b/src/libstd/bool.rs @@ -295,6 +295,7 @@ impl Default for bool { mod tests { use prelude::*; use super::all_values; + use from_str::FromStr; #[test] fn test_bool() { diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index e4f3676432378..f67ba8fce03e0 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -340,6 +340,7 @@ impl FromStr for SocketAddr { mod test { use prelude::*; use super::*; + use from_str::FromStr; #[test] fn test_from_str_ipv4() { diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index a4eac564ee692..559415a15c86c 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -15,6 +15,7 @@ use prelude::*; use cmath; use default::Default; +use from_str::FromStr; use libc::{c_float, c_int}; use num::{FPCategory, FPNaN, FPInfinite , FPZero, FPSubnormal, FPNormal}; use num::{Zero, One, Bounded, strconv}; diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index e6b903cbbdb6e..1d1646f8f635c 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -16,6 +16,7 @@ use prelude::*; use cmath; use default::Default; +use from_str::FromStr; use libc::{c_double, c_int}; use num::{FPCategory, FPNaN, FPInfinite , FPZero, FPSubnormal, FPNormal}; use num::{Zero, One, Bounded, strconv}; diff --git a/src/libstd/num/i16.rs b/src/libstd/num/i16.rs index 141626ed98a75..0ecb55e510608 100644 --- a/src/libstd/num/i16.rs +++ b/src/libstd/num/i16.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; use num::{Bitwise, Bounded, CheckedAdd, CheckedSub, CheckedMul}; use num::{CheckedDiv, Zero, One, strconv}; use num::{ToStrRadix, FromStrRadix}; diff --git a/src/libstd/num/i32.rs b/src/libstd/num/i32.rs index a43a6e6a288cd..0526f2c488b20 100644 --- a/src/libstd/num/i32.rs +++ b/src/libstd/num/i32.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; use num::{Bitwise, Bounded, CheckedAdd, CheckedSub, CheckedMul}; use num::{CheckedDiv, Zero, One, strconv}; use num::{ToStrRadix, FromStrRadix}; diff --git a/src/libstd/num/i64.rs b/src/libstd/num/i64.rs index e8503d808a703..0c1c01dbf4ab8 100644 --- a/src/libstd/num/i64.rs +++ b/src/libstd/num/i64.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; #[cfg(target_word_size = "64")] use num::CheckedMul; use num::{Bitwise, Bounded, CheckedAdd, CheckedSub}; diff --git a/src/libstd/num/i8.rs b/src/libstd/num/i8.rs index 9f857ff40ff50..881cc46201ef5 100644 --- a/src/libstd/num/i8.rs +++ b/src/libstd/num/i8.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; use num::{Bitwise, Bounded, CheckedAdd, CheckedSub, CheckedMul}; use num::{CheckedDiv, Zero, One, strconv}; use num::{ToStrRadix, FromStrRadix}; diff --git a/src/libstd/num/int.rs b/src/libstd/num/int.rs index 6d1a50b724fd2..83c9e8ea855bc 100644 --- a/src/libstd/num/int.rs +++ b/src/libstd/num/int.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; use num::{Bitwise, Bounded, CheckedAdd, CheckedSub, CheckedMul}; use num::{CheckedDiv, Zero, One, strconv}; use num::{ToStrRadix, FromStrRadix}; diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs index 030aa2d81fa24..ea62a3ec374d3 100644 --- a/src/libstd/num/int_macros.rs +++ b/src/libstd/num/int_macros.rs @@ -295,8 +295,9 @@ mod tests { use int; use i32; use num; - use num::CheckedDiv; use num::Bitwise; + use num::CheckedDiv; + use num::ToStrRadix; #[test] fn test_overflows() { diff --git a/src/libstd/num/u16.rs b/src/libstd/num/u16.rs index da0293b341864..d1de1ff0a723c 100644 --- a/src/libstd/num/u16.rs +++ b/src/libstd/num/u16.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; use num::{Bitwise, Bounded}; use num::{CheckedAdd, CheckedSub, CheckedMul}; use num::{CheckedDiv, Zero, One, strconv}; diff --git a/src/libstd/num/u32.rs b/src/libstd/num/u32.rs index b103e18f7019f..1caec67802539 100644 --- a/src/libstd/num/u32.rs +++ b/src/libstd/num/u32.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; use num::{Bitwise, Bounded}; use num::{CheckedAdd, CheckedSub, CheckedMul}; use num::{CheckedDiv, Zero, One, strconv}; diff --git a/src/libstd/num/u64.rs b/src/libstd/num/u64.rs index f7956f0128e5e..ab495834eaa5f 100644 --- a/src/libstd/num/u64.rs +++ b/src/libstd/num/u64.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; use num::{Bitwise, Bounded}; #[cfg(target_word_size = "64")] use num::CheckedMul; diff --git a/src/libstd/num/u8.rs b/src/libstd/num/u8.rs index e6ce9c72e96b2..a0ef574f6cf2f 100644 --- a/src/libstd/num/u8.rs +++ b/src/libstd/num/u8.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; use num::{Bitwise, Bounded}; use num::{CheckedAdd, CheckedSub, CheckedMul}; use num::{CheckedDiv, Zero, One, strconv}; diff --git a/src/libstd/num/uint.rs b/src/libstd/num/uint.rs index a8c85787f7ec8..95d4a3a50be57 100644 --- a/src/libstd/num/uint.rs +++ b/src/libstd/num/uint.rs @@ -15,6 +15,7 @@ use prelude::*; use default::Default; +use from_str::FromStr; use num::{Bitwise, Bounded}; use num::{CheckedAdd, CheckedSub, CheckedMul}; use num::{CheckedDiv, Zero, One, strconv}; diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs index 001927e603312..719afeb78784a 100644 --- a/src/libstd/num/uint_macros.rs +++ b/src/libstd/num/uint_macros.rs @@ -233,6 +233,7 @@ mod tests { use num; use num::CheckedDiv; use num::Bitwise; + use num::ToStrRadix; use u16; #[test] diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index ce746852daed6..cc1a14a4f822d 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -43,14 +43,12 @@ pub use char::Char; pub use clone::{Clone, DeepClone}; pub use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater, Equiv}; pub use container::{Container, Mutable, Map, MutableMap, Set, MutableSet}; -pub use default::Default; -pub use from_str::FromStr; pub use iter::{FromIterator, Extendable}; pub use iter::{Iterator, DoubleEndedIterator, RandomAccessIterator, CloneableIterator}; pub use iter::{OrdIterator, MutableDoubleEndedIterator, ExactSize}; pub use num::{Num, NumCast, CheckedAdd, CheckedSub, CheckedMul}; pub use num::{Signed, Unsigned, Round}; -pub use num::{Primitive, Int, Float, ToStrRadix, ToPrimitive, FromPrimitive}; +pub use num::{Primitive, Int, Float, ToPrimitive, FromPrimitive}; pub use path::{GenericPath, Path, PosixPath, WindowsPath}; pub use ptr::RawPtr; pub use io::{Buffer, Writer, Reader, Seek}; diff --git a/src/libstd/rand/reseeding.rs b/src/libstd/rand/reseeding.rs index 758ca22e5c3ec..a916ce173fb60 100644 --- a/src/libstd/rand/reseeding.rs +++ b/src/libstd/rand/reseeding.rs @@ -144,6 +144,7 @@ impl Default for ReseedWithDefault { mod test { use prelude::*; use super::*; + use default::Default; use rand::{SeedableRng, Rng}; struct Counter { diff --git a/src/libstd/str.rs b/src/libstd/str.rs index daaf46be18767..12044b4a06a5b 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -3072,6 +3072,7 @@ impl Default for ~str { #[cfg(test)] mod tests { use iter::AdditiveIterator; + use default::Default; use prelude::*; use str::*; diff --git a/src/libsyntax/crateid.rs b/src/libsyntax/crateid.rs index 2417a6fa1bacf..659cd13c94dd1 100644 --- a/src/libsyntax/crateid.rs +++ b/src/libsyntax/crateid.rs @@ -17,6 +17,9 @@ use std::fmt; /// `1.0`. If no crate name is given after the hash, the name is inferred to /// be the last component of the path. If no version is given, it is inferred /// to be `0.0`. + +use std::from_str::FromStr; + #[deriving(Clone, Eq)] pub struct CrateId { /// A path which represents the codes origin. By convention this is the diff --git a/src/libsyntax/opt_vec.rs b/src/libsyntax/opt_vec.rs index 3abd411a00399..325df0ba77775 100644 --- a/src/libsyntax/opt_vec.rs +++ b/src/libsyntax/opt_vec.rs @@ -16,6 +16,7 @@ */ use std::vec; +use std::default::Default; #[deriving(Clone, Encodable, Decodable, Hash)] pub enum OptVec { diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index c0c62d93b39e9..1fd07dd7ded73 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -42,6 +42,7 @@ use term::color::{Color, RED, YELLOW, GREEN, CYAN}; use std::cmp; use std::f64; use std::fmt; +use std::from_str::FromStr; use std::io::stdio::StdWriter; use std::io::{File, PortReader, ChanWriter}; use std::io; diff --git a/src/libuuid/lib.rs b/src/libuuid/lib.rs index 7a3ed09a492d7..8dbdedc18483a 100644 --- a/src/libuuid/lib.rs +++ b/src/libuuid/lib.rs @@ -66,7 +66,9 @@ extern crate serialize; use std::cast::{transmute,transmute_copy}; use std::char::Char; +use std::default::Default; use std::fmt; +use std::from_str::FromStr; use std::hash::{Hash, sip}; use std::num::FromStrRadix; use std::rand::Rng; diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout-threadring.rs index 7063194eab862..6ce6fb503a1d8 100644 --- a/src/test/bench/shootout-threadring.rs +++ b/src/test/bench/shootout-threadring.rs @@ -55,6 +55,8 @@ fn roundtrip(id: int, n_tasks: int, p: &Port, ch: &Chan) { } fn main() { + use std::from_str::FromStr; + let args = if os::getenv("RUST_BENCH").is_some() { ~[~"", ~"2000000", ~"503"] }