Update to rand 0.6.5 and migrate off deprecated methods. Closes #81

* Import from rand_xorshift crate

* Use shuffle/choose from SliceRandom trait

See https://rust-random.github.io/book/update-0.6.html

Author: iceiix

Cargo.lock

@@ -28,7 +28,8 @@ serde_json = "1.0.39"
 flate2 = { version = "1.0.7", features = ["rust_backend"], default-features = false }
 zip = { version = "0.5.2", features = ["deflate"], default-features = false }
 image = "0.21.1"
-rand = "0.5.5"
+rand = "0.6.5"
+rand_xorshift = "0.1.1"
 hex = "0.3.2"
 base64 = "0.10.1"
 log = { version = "0.4.6", features = ["std"] }

Cargo.toml

@@ -110,6 +110,7 @@ struct BuildReply {
 
 fn build_func(id: usize, models: Arc<RwLock<model::Factory>>, work_recv: mpsc::Receiver<BuildReq>, built_send: mpsc::Sender<(usize, BuildReply)>) {
     use rand::{self, SeedableRng, Rng};
+    use rand_xorshift;
     loop {
         let BuildReq {
             snapshot,
@@ -121,7 +122,7 @@ fn build_func(id: usize, models: Arc<RwLock<model::Factory>>, work_recv: mpsc::R
             Err(_) => return,
         };
 
-        let mut rng = rand::XorShiftRng::from_seed([
+        let mut rng = rand_xorshift::XorShiftRng::from_seed([
             ((position.0 as u32) & 0xff) as u8,
             (((position.0 as u32) >> 8) & 0xff) as u8,
             (((position.0 as u32) >> 16) & 0xff) as u8,

src/chunk_builder.rs

@@ -18,6 +18,7 @@ use crate::types::hash::FNVHash;
 use log::{error};
 
 use rand::Rng;
+use rand::seq::SliceRandom;
 use image::GenericImageView;
 
 pub struct Factory {
@@ -756,7 +757,7 @@ pub struct Variants {
 impl Variants {
     fn choose_model<R: Rng>(&self, rng: &mut R) -> &Model {
         // TODO: Weighted random
-        rng.choose(&self.models).unwrap()
+        self.models.choose(rng).unwrap()
     }
 }
 

src/model/mod.rs

@@ -5,8 +5,8 @@ use crate::ui;
 use crate::render;
 use crate::resources;
 use std::time::{SystemTime, UNIX_EPOCH};
-use rand;
-use rand::Rng;
+use rand::{self, seq::SliceRandom};
+use rand_xorshift;
 
 pub struct Logo {
     _shadow: ui::BatchRef,
@@ -101,8 +101,8 @@ impl Logo {
                     text_strings.push(line.to_owned().replace("\r", ""));
                 }
             }
-            let mut r: rand::XorShiftRng = rand::SeedableRng::from_seed([45, 0, 0, 0, 64, 0, 0, 0, 32, 0, 0, 0, 12, 0, 0, 0]);
-            r.shuffle(&mut text_strings[..]);
+            let mut r: rand_xorshift::XorShiftRng = rand::SeedableRng::from_seed([45, 0, 0, 0, 64, 0, 0, 0, 32, 0, 0, 0, 12, 0, 0, 0]);
+            text_strings.shuffle(&mut r);
         }
 
         let txt = ui::TextBuilder::new()