Skip to content

Commit 0e84e68

Browse files
committed
---
yaml --- r: 95296 b: refs/heads/dist-snap c: e678435 h: refs/heads/master v: v3
1 parent 372527c commit 0e84e68

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 5442a473624f9d463a21508a5dbdd5a5ec326c15
9+
refs/heads/dist-snap: e678435cab9cc8ddd668d4cb58ab82194c220382
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/rand/mod.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,6 @@ impl SeedableRng<[u32, .. 4]> for XorShiftRng {
648648
impl XorShiftRng {
649649
/// Create an xor shift random number generator with a random seed.
650650
pub fn new() -> XorShiftRng {
651-
// generate seeds the same way as seed(), except we have a
652-
// specific size, so we can just use a fixed buffer.
653651
let mut s = [0u8, ..16];
654652
loop {
655653
let mut r = OSRng::new();
@@ -714,6 +712,11 @@ impl<R: Rng> Rng for @mut R {
714712
fn next_u64(&mut self) -> u64 {
715713
(**self).next_u64()
716714
}
715+
716+
#[inline]
717+
fn fill_bytes(&mut self, bytes: &mut [u8]) {
718+
(**self).fill_bytes(bytes);
719+
}
717720
}
718721

719722
/// Generate a random value using the task-local random number

branches/dist-snap/src/libstd/rt/sched.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,6 @@ fn new_sched_rng() -> XorShiftRng {
863863
use iter::Iterator;
864864
use rand::SeedableRng;
865865

866-
// XXX: this could use io::native::file, when it works.
867866
let fd = do "/dev/urandom".with_c_str |name| {
868867
unsafe { libc::open(name, libc::O_RDONLY, 0) }
869868
};

0 commit comments

Comments
 (0)