Skip to content

Commit

Permalink
Fix errors, remove unused files
Browse files Browse the repository at this point in the history
  • Loading branch information
GuillaumeGomez committed Mar 1, 2015
1 parent 9e28cae commit c74d49c
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 54 deletions.
21 changes: 0 additions & 21 deletions src/libcore/num/int.rs

This file was deleted.

20 changes: 0 additions & 20 deletions src/libcore/num/uint.rs

This file was deleted.

24 changes: 12 additions & 12 deletions src/librand/rand_impls.rs
Expand Up @@ -12,18 +12,18 @@

use core::prelude::*;
use core::char;
use core::int;
use core::uint;
use core::isize;
use core::usize;

use {Rand,Rng};

impl Rand for int {
impl Rand for isize {
#[inline]
fn rand<R: Rng>(rng: &mut R) -> int {
if int::BITS == 32 {
rng.gen::<i32>() as int
fn rand<R: Rng>(rng: &mut R) -> isize {
if isize::BITS == 32 {
rng.gen::<i32>() as isize
} else {
rng.gen::<i64>() as int
rng.gen::<i64>() as isize
}
}
}
Expand Down Expand Up @@ -56,13 +56,13 @@ impl Rand for i64 {
}
}

impl Rand for uint {
impl Rand for usize {
#[inline]
fn rand<R: Rng>(rng: &mut R) -> uint {
if uint::BITS == 32 {
rng.gen::<u32>() as uint
fn rand<R: Rng>(rng: &mut R) -> usize {
if usize::BITS == 32 {
rng.gen::<u32>() as usize
} else {
rng.gen::<u64>() as uint
rng.gen::<u64>() as usize
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/lib.rs
Expand Up @@ -109,7 +109,7 @@
#![feature(box_syntax)]
#![feature(collections)]
#![feature(core)]
#![feature(int_uint)]
#![feature(hash)]
#![feature(lang_items)]
#![feature(libc)]
#![feature(linkage, thread_local, asm)]
Expand Down

0 comments on commit c74d49c

Please sign in to comment.