Fix compiler warnings

Some minor stuff, mostly. The features have been stable since 1.20

3 files changed, 8 insertions, 13 deletions

diff --git a/src/synth/math.rs b/src/synth/math.rs
index eb1a604..2b81786 100644
--- a/src/synth/math.rs
+++ b/src/synth/math.rs
@@ -108,7 +108,7 @@ pub struct NegateFactory;
 
 impl GeneratorFactory for NegateFactory {
     fn new(&self, params: &mut FactoryParameters) -> Result<GenBox, GenFactoryError> {
-        let mut gen = params.remove_param("value", 0)?.as_gen()?;
+        let gen = params.remove_param("value", 0)?.as_gen()?;
         let len = gen.buffer().len();
         Ok(Box::new(Negate {
             value: gen,
@@ -150,7 +150,7 @@ pub struct ReciprocateFactory;
 
 impl GeneratorFactory for ReciprocateFactory {
     fn new(&self, params: &mut FactoryParameters) -> Result<GenBox, GenFactoryError> {
-        let mut gen = params.remove_param("value", 0)?.as_gen()?;
+        let gen = params.remove_param("value", 0)?.as_gen()?;
         let len = gen.buffer().len();
         Ok(Box::new(Reciprocate {
             value: gen,
diff --git a/src/synth/mod.rs b/src/synth/mod.rs
index b22e162..6ec55f1 100644
--- a/src/synth/mod.rs
+++ b/src/synth/mod.rs
@@ -1,3 +1,5 @@
+#![allow(non_upper_case_globals)]
+
 use std::{iter, cmp, slice, mem, fmt};
 use std::fmt::Debug;
 use std::error::Error;
diff --git a/src/synth/noise.rs b/src/synth/noise.rs
index 68c120f..28a6b60 100644
--- a/src/synth/noise.rs
+++ b/src/synth/noise.rs
@@ -2,7 +2,6 @@ use std::mem;
 use super::*;
 
 use ::rand::{XorShiftRng, Rng, SeedableRng};
-use ::rand::os::OsRng;
 
 #[derive(Debug)]
 pub struct Noise {
@@ -11,7 +10,7 @@ pub struct Noise {
 }
 
 impl Generator for Noise {
-    fn eval<'a>(&'a mut self, params: &Parameters) -> &'a SampleBuffer {
+    fn eval<'a>(&'a mut self, _params: &Parameters) -> &'a SampleBuffer {
         self.buf.rate = Rate::Sample;
 
         for i in 0..self.buf.len() {
@@ -26,23 +25,17 @@ impl Generator for Noise {
     }
 }
 
-static mut _rand_gen: Option<OsRng> = None;
-
 pub struct NoiseFactory;
 
 impl GeneratorFactory for NoiseFactory {
     fn new(&self, params: &mut FactoryParameters) -> Result<GenBox, GenFactoryError> {
-        if unsafe { &_rand_gen }.is_none() {
-            unsafe {_rand_gen = Some(OsRng::new().expect("Couldn't initialize OS random")); }
-        }
-
-        let mut seed: [u32; 4] = Default::default();
+        let mut seed: [u32; 4] = ::rand::random();
         for i in seed.iter_mut() {
-            *i = unsafe { &mut _rand_gen }.as_mut().unwrap().next_u32();
+            *i = ::rand::random()
         }
 
         Ok(Box::new(Noise {
-            rng: XorShiftRng::from_seed(seed),
+            rng: XorShiftRng::from_seed(::rand::random()),
             buf: SampleBuffer::new(params.env.default_buffer_size),
         }))
     }