Skip to content

Commit c74d49c

Browse files
committedMar 1, 2015
Fix errors, remove unused files
1 parent 9e28cae commit c74d49c

File tree

4 files changed

+13
-54
lines changed

4 files changed

+13
-54
lines changed
 

‎src/libcore/num/int.rs

-21
This file was deleted.

‎src/libcore/num/uint.rs

-20
This file was deleted.

‎src/librand/rand_impls.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
1313
use core::prelude::*;
1414
use core::char;
15-
use core::int;
16-
use core::uint;
15+
use core::isize;
16+
use core::usize;
1717

1818
use {Rand,Rng};
1919

20-
impl Rand for int {
20+
impl Rand for isize {
2121
#[inline]
22-
fn rand<R: Rng>(rng: &mut R) -> int {
23-
if int::BITS == 32 {
24-
rng.gen::<i32>() as int
22+
fn rand<R: Rng>(rng: &mut R) -> isize {
23+
if isize::BITS == 32 {
24+
rng.gen::<i32>() as isize
2525
} else {
26-
rng.gen::<i64>() as int
26+
rng.gen::<i64>() as isize
2727
}
2828
}
2929
}
@@ -56,13 +56,13 @@ impl Rand for i64 {
5656
}
5757
}
5858

59-
impl Rand for uint {
59+
impl Rand for usize {
6060
#[inline]
61-
fn rand<R: Rng>(rng: &mut R) -> uint {
62-
if uint::BITS == 32 {
63-
rng.gen::<u32>() as uint
61+
fn rand<R: Rng>(rng: &mut R) -> usize {
62+
if usize::BITS == 32 {
63+
rng.gen::<u32>() as usize
6464
} else {
65-
rng.gen::<u64>() as uint
65+
rng.gen::<u64>() as usize
6666
}
6767
}
6868
}

‎src/libstd/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
#![feature(box_syntax)]
110110
#![feature(collections)]
111111
#![feature(core)]
112-
#![feature(int_uint)]
112+
#![feature(hash)]
113113
#![feature(lang_items)]
114114
#![feature(libc)]
115115
#![feature(linkage, thread_local, asm)]

0 commit comments

Comments
 (0)
Please sign in to comment.