From 84a8893f19c4cf87355984c8d5fa604a5828161a Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Sun, 23 Feb 2014 12:29:42 +1100 Subject: [PATCH] Remove std::from_str::FromStr from the prelude --- src/libextra/url.rs | 1 + src/libnum/bigint.rs | 2 ++ src/libstd/bool.rs | 1 + src/libstd/io/net/ip.rs | 1 + src/libstd/num/f32.rs | 1 + src/libstd/num/f64.rs | 1 + src/libstd/num/i16.rs | 1 + src/libstd/num/i32.rs | 1 + src/libstd/num/i64.rs | 1 + src/libstd/num/i8.rs | 1 + src/libstd/num/int.rs | 1 + src/libstd/num/u16.rs | 1 + src/libstd/num/u32.rs | 1 + src/libstd/num/u64.rs | 1 + src/libstd/num/u8.rs | 1 + src/libstd/num/uint.rs | 1 + src/libstd/prelude.rs | 1 - src/libsyntax/crateid.rs | 3 +++ src/libtest/lib.rs | 1 + src/libuuid/lib.rs | 1 + src/test/bench/shootout-threadring.rs | 2 ++ 21 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/libextra/url.rs b/src/libextra/url.rs index 0292a18817cc..5812aaa5038d 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 894b3794581e..cb3faca017bd 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,6 +1398,7 @@ 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::{ToPrimitive, FromPrimitive}; diff --git a/src/libstd/bool.rs b/src/libstd/bool.rs index 918d42e1bce4..2376603fcc8f 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 e4f367643237..f67ba8fce03e 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 a98fd31c4572..a686edef99e6 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 5975ce40d84f..026bd651e0e3 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 141626ed98a7..0ecb55e51060 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 a43a6e6a288c..0526f2c488b2 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 e8503d808a70..0c1c01dbf4ab 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 9f857ff40ff5..881cc46201ef 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 6d1a50b724fd..83c9e8ea855b 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/u16.rs b/src/libstd/num/u16.rs index da0293b34186..d1de1ff0a723 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 b103e18f7019..1caec6780253 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 f7956f0128e5..ab495834eaa5 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 e6ce9c72e96b..a0ef574f6cf2 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 a8c85787f7ec..95d4a3a50be5 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/prelude.rs b/src/libstd/prelude.rs index 63f54da76ba0..80781ce59f14 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -43,7 +43,6 @@ 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 from_str::FromStr; pub use iter::{FromIterator, Extendable}; pub use iter::{Iterator, DoubleEndedIterator, RandomAccessIterator, CloneableIterator}; pub use iter::{OrdIterator, MutableDoubleEndedIterator, ExactSize}; diff --git a/src/libsyntax/crateid.rs b/src/libsyntax/crateid.rs index 2417a6fa1bac..659cd13c94dd 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/libtest/lib.rs b/src/libtest/lib.rs index 6093948d9f4d..02950c075829 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -41,6 +41,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 a978a9074f04..8dbdedc18483 100644 --- a/src/libuuid/lib.rs +++ b/src/libuuid/lib.rs @@ -68,6 +68,7 @@ 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 7063194eab86..6ce6fb503a1d 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"] }