Skip to content

Commit a07dfc6

Browse files
brendanzabalexcrichton
authored andcommitted
---
yaml --- r: 149534 b: refs/heads/try2 c: dad52cf h: refs/heads/master v: v3
1 parent 31a0844 commit a07dfc6

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 84a8893f19c4cf87355984c8d5fa604a5828161a
8+
refs/heads/try2: dad52cfcb58cb30170c6247f2053bc0f0d57466a
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libnum/bigint.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ mod biguint_tests {
14001400
use std::cmp::{Less, Equal, Greater};
14011401
use std::from_str::FromStr;
14021402
use std::i64;
1403-
use std::num::{Zero, One, FromStrRadix};
1403+
use std::num::{Zero, One, FromStrRadix, ToStrRadix};
14041404
use std::num::{ToPrimitive, FromPrimitive};
14051405
use std::rand::{task_rng};
14061406
use std::str;
@@ -2058,7 +2058,7 @@ mod bigint_tests {
20582058

20592059
use std::cmp::{Less, Equal, Greater};
20602060
use std::i64;
2061-
use std::num::{Zero, One, FromStrRadix};
2061+
use std::num::{Zero, One, FromStrRadix, ToStrRadix};
20622062
use std::num::{ToPrimitive, FromPrimitive};
20632063
use std::rand::{task_rng};
20642064
use std::u64;

branches/try2/src/libnum/rational.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ impl<T: FromStrRadix + Clone + Integer + Ord>
333333
mod test {
334334

335335
use super::{Ratio, Rational, BigRational};
336-
use std::num::{Zero,One,FromStrRadix,FromPrimitive};
336+
use std::num::{Zero, One, FromStrRadix, FromPrimitive, ToStrRadix};
337337
use std::from_str::FromStr;
338338

339339
pub static _0 : Rational = Ratio { numer: 0, denom: 1};

branches/try2/src/libstd/num/int_macros.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,9 @@ mod tests {
295295
use int;
296296
use i32;
297297
use num;
298-
use num::CheckedDiv;
299298
use num::Bitwise;
299+
use num::CheckedDiv;
300+
use num::ToStrRadix;
300301

301302
#[test]
302303
fn test_overflows() {

branches/try2/src/libstd/num/uint_macros.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ mod tests {
233233
use num;
234234
use num::CheckedDiv;
235235
use num::Bitwise;
236+
use num::ToStrRadix;
236237
use u16;
237238

238239
#[test]

branches/try2/src/libstd/prelude.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub use iter::{Iterator, DoubleEndedIterator, RandomAccessIterator, CloneableIte
4848
pub use iter::{OrdIterator, MutableDoubleEndedIterator, ExactSize};
4949
pub use num::{Num, NumCast, CheckedAdd, CheckedSub, CheckedMul};
5050
pub use num::{Signed, Unsigned, Round};
51-
pub use num::{Primitive, Int, Float, ToStrRadix, ToPrimitive, FromPrimitive};
51+
pub use num::{Primitive, Int, Float, ToPrimitive, FromPrimitive};
5252
pub use path::{GenericPath, Path, PosixPath, WindowsPath};
5353
pub use ptr::RawPtr;
5454
pub use io::{Buffer, Writer, Reader, Seek};

0 commit comments

Comments
 (0)