---

yaml
---
r: 56344
b: refs/heads/auto
c: 5667902
h: refs/heads/master
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: e6c4471ed8c54a035f1cc2096d04cc44fd4cd14b
+refs/heads/auto: 56679024c551c51a1eea8a03dbe8570f56687521
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/rand.rs

@@ -115,6 +115,40 @@ impl Rand for bool {
     }
 }
 
+macro_rules! tuple_impl {
+    // use variables to indicate the arity of the tuple
+    ($($tyvar:ident),* ) => {
+        // the trailing commas are for the 1 tuple
+        impl<
+            $( $tyvar : Rand ),*
+            > Rand for ( $( $tyvar ),* , ) {
+
+            fn rand (_rng: @Rng) -> ( $( $tyvar ),* , ) {
+                (
+                    // use the $var's to get the appropriate number of repeats
+                    // (they're not actually needed)
+                    $(
+                        _rng.gen::<$tyvar>()
+                    ),*
+                    ,
+                )
+            }
+        }
+    }
+}
+
+impl Rand for () { fn rand(_: @Rng) -> () { () } }
+tuple_impl!{A}
+tuple_impl!{A, B}
+tuple_impl!{A, B, C}
+tuple_impl!{A, B, C, D}
+tuple_impl!{A, B, C, D, E}
+tuple_impl!{A, B, C, D, E, F}
+tuple_impl!{A, B, C, D, E, F, G}
+tuple_impl!{A, B, C, D, E, F, G, H}
+tuple_impl!{A, B, C, D, E, F, G, H, I}
+tuple_impl!{A, B, C, D, E, F, G, H, I, J}
+
 impl<T:Rand> Rand for Option<T> {
     fn rand(rng: @rand::Rng) -> Option<T> {
         if rng.gen_bool() {
@@ -125,6 +159,14 @@ impl<T:Rand> Rand for Option<T> {
     }
 }
 
+impl<T: Rand> Rand for ~T {
+    fn rand(rng: @Rng) -> ~T { ~rng.gen() }
+}
+
+impl<T: Rand> Rand for @T {
+    fn rand(rng: @Rng) -> @T { @rng.gen() }
+}
+
 #[allow(non_camel_case_types)] // runtime type
 pub enum rust_rng {}
 
@@ -927,6 +969,10 @@ mod tests {
         let _n : uint = rand::random();
         let _f : f32 = rand::random();
         let _o : Option<Option<i8>> = rand::random();
+        let _many : ((),
+                     (~uint, @int, ~Option<~(@char, ~(@bool,))>),
+                     (u8, i8, u16, i16, u32, i32, u64, i64),
+                     (f32, (f64, (float,)))) = rand::random();
     }
 }
 

branches/auto/src/libstd/num/rational.rs

@@ -51,7 +51,7 @@ impl<T: Copy + Num + Ord>
     #[inline(always)]
     pub fn new(numer: T, denom: T) -> Ratio<T> {
         if denom == Zero::zero() {
-            fail!(~"denominator == 0");
+            fail!(~"quotient of 0");
         }
         let mut ret = Ratio::new_raw(numer, denom);
         ret.reduce();