---

yaml
---
r: 56335
b: refs/heads/auto
c: aa763cd
h: refs/heads/master
i:
  56333: 530e96e
  56331: b76c342
  56327: 318b14f
  56319: cb661b0
v: v3

Author: huonw

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 91d1d00367755e55deeea4913a5aad03d8dbd88a
+refs/heads/auto: aa763cdb238bb9c9f26d84a699d9f0de8289d8c4
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/rand.rs

@@ -55,6 +55,12 @@ impl Rand for i64 {
     }
 }
 
+impl Rand for uint {
+    fn rand(rng: @rand::Rng) -> uint {
+        rng.gen_uint()
+    }
+}
+
 impl Rand for u8 {
     fn rand(rng: @rand::Rng) -> u8 {
         rng.gen_u8()
@@ -149,6 +155,7 @@ pub struct Weighted<T> {
 }
 
 pub trait RngUtil {
+    /// Return a random value for a Rand type
     fn gen<T:Rand>(&self) -> T;
     /**
      * Return a random int
@@ -739,10 +746,11 @@ pub fn task_rng() -> @Rng {
 }
 
 /**
- * Returns a random uint, using the task's based random number generator.
+ * Returns a random value of a Rand type, using the task's random number
+ * generator.
  */
-pub fn random() -> uint {
-    task_rng().gen_uint()
+pub fn random<T: Rand>() -> T {
+    task_rng().gen()
 }
 
 
@@ -915,8 +923,10 @@ mod tests {
 
     #[test]
     fn random() {
-        // not sure how to test this aside from just getting a number
+        // not sure how to test this aside from just getting some values
         let _n : uint = rand::random();
+        let _f : f32 = rand::random();
+        let _o : Option<Option<i8>> = rand::random();
     }
 }
 

branches/auto/src/test/bench/shootout-fasta-redux.rs

@@ -1,6 +1,6 @@
 use core::cast::transmute;
 use core::from_str::FromStr;
-use core::libc::{FILE, STDOUT_FILENO, c_int, fdopen, fputc, fputs, fwrite, size_t};
+use core::libc::{FILE, STDOUT_FILENO, c_int, fdopen, fputc, fputs, fwrite};
 use core::uint::{min, range};
 use core::vec::bytes::copy_memory;
 
@@ -99,7 +99,7 @@ impl RepeatFasta {
             let mut pos = 0, bytes, n = n;
             while n > 0 {
                 bytes = min(LINE_LEN, n);
-                fwrite(transmute(&buf[pos]), bytes as size_t, 1, stdout);
+                fwrite(transmute(&buf[pos]), bytes as u64, 1, stdout);
                 fputc('\n' as c_int, stdout);
                 pos += bytes;
                 if pos > alu_len {
@@ -164,14 +164,14 @@ impl RandomFasta {
                 }
                 buf[LINE_LEN] = '\n' as u8;
                 fwrite(transmute(&buf[0]),
-                       LINE_LEN as size_t + 1,
+                       LINE_LEN as u64 + 1,
                        1,
                        self.stdout);
             }
             for range(0, chars_left) |i| {
                 buf[i] = self.nextc();
             }
-            fwrite(transmute(&buf[0]), chars_left as size_t, 1, self.stdout);
+            fwrite(transmute(&buf[0]), chars_left as u64, 1, self.stdout);
         }
     }
 }

branches/auto/src/test/bench/shootout-threadring.rs

@@ -10,8 +10,6 @@
 
 // Based on threadring.erlang by Jira Isa
 
-// xfail-test FIXME #5985 OOM's on the mac bot
-
 fn start(n_tasks: int, token: int) {
     let mut (p, ch1) = comm::stream();
     ch1.send(token);