From dad52cfcb58cb30170c6247f2053bc0f0d57466a Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Sun, 23 Feb 2014 12:41:43 +1100 Subject: [PATCH] Remove std::num::ToStrRadix from the prelude --- src/libnum/bigint.rs | 4 ++-- src/libnum/rational.rs | 2 +- src/libstd/num/int_macros.rs | 3 ++- src/libstd/num/uint_macros.rs | 1 + src/libstd/prelude.rs | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libnum/bigint.rs b/src/libnum/bigint.rs index cb3faca017bd..63f48ea9d222 100644 --- a/src/libnum/bigint.rs +++ b/src/libnum/bigint.rs @@ -1400,7 +1400,7 @@ mod biguint_tests { 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; @@ -2058,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 44a916c5d4e2..79ff54cb90c6 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/num/int_macros.rs b/src/libstd/num/int_macros.rs index 030aa2d81fa2..ea62a3ec374d 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/uint_macros.rs b/src/libstd/num/uint_macros.rs index 001927e60331..719afeb78784 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 80781ce59f14..cc1a14a4f822 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -48,7 +48,7 @@ pub use iter::{Iterator, DoubleEndedIterator, RandomAccessIterator, CloneableIte 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};