remove unneeded dependency on rand

Author: dwrensha

benchmark/Cargo.toml

@@ -19,5 +19,4 @@ path = "run_all.rs"
 capnpc = { path = "../capnpc" }
 
 [dependencies]
-rand = "0.4"
 capnp = { path = "../capnp" }

benchmark/benchmark.rs

@@ -20,7 +20,6 @@
 // THE SOFTWARE.
 
 extern crate capnp;
-extern crate rand;
 
 use std::{mem, io};
 

benchmark/carsales.rs

@@ -19,7 +19,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-use rand::*;
 use common::*;
 use carsales_capnp::{parking_lot, total_value, Color, car};
 
@@ -114,17 +113,17 @@ pub fn random_car(rng: &mut FastRand, mut car: car::Builder) {
         engine.set_cylinders(4 + 2 * rng.next_less_than(3) as u8);
         engine.set_cc(800 + rng.next_less_than(10000));
         engine.set_uses_gas(true);
-        engine.set_uses_electric(rng.gen());
+        engine.set_uses_electric(rng.next_bool());
     }
 
     let fuel_capacity = (10.0 + rng.next_double(30.0)) as f32;
     car.set_fuel_capacity(fuel_capacity);
     car.set_fuel_level(rng.next_double(fuel_capacity as f64) as f32);
-    car.set_has_power_windows(rng.gen());
-    car.set_has_power_steering(rng.gen());
-    car.set_has_cruise_control(rng.gen());
+    car.set_has_power_windows(rng.next_bool());
+    car.set_has_power_steering(rng.next_bool());
+    car.set_has_cruise_control(rng.next_bool());
     car.set_cup_holders(rng.next_less_than(12) as u8);
-    car.set_has_nav_system(rng.gen());
+    car.set_has_nav_system(rng.next_bool());
 }
 
 pub struct CarSales;

benchmark/common.rs

@@ -19,7 +19,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-use rand::*;
 use std::i32;
 
 #[derive(Clone, Copy)]
@@ -30,18 +29,6 @@ pub struct FastRand {
     w: u32,
 }
 
-impl Rng for FastRand {
-    #[inline]
-    fn next_u32(&mut self) -> u32 {
-        let tmp = self.x ^ (self.x << 11);
-        self.x = self.y;
-        self.y = self.z;
-        self.z = self.w;
-        self.w = self.w ^ (self.w >> 19) ^ tmp ^ (tmp >> 8);
-        return self.w;
-    }
-}
-
 impl FastRand {
     pub fn new() -> FastRand {
         FastRand {
@@ -52,11 +39,26 @@ impl FastRand {
         }
     }
 
+    #[inline]
+    pub fn next_u32(&mut self) -> u32 {
+        let tmp = self.x ^ (self.x << 11);
+        self.x = self.y;
+        self.y = self.z;
+        self.z = self.w;
+        self.w = self.w ^ (self.w >> 19) ^ tmp ^ (tmp >> 8);
+        return self.w;
+    }
+
     #[inline]
     pub fn next_less_than(&mut self, range : u32) -> u32 {
         self.next_u32() % range
     }
 
+    #[inline]
+    pub fn next_bool(&mut self) -> bool {
+        (self.next_u32() % 2) == 1
+    }
+
     #[inline]
     pub fn next_double(&mut self, range : f64) -> f64 {
         use std::u32;