Skip to content

Commit

Permalink
Update rand dependency to 0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
danieldk committed Nov 1, 2019
1 parent f62afda commit 9838f33
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,17 @@ memmap = "0.7"
ndarray = "0.13"
ndarray-rand = "0.11"
num_cpus = "1"
rand = "0.6"
rand_core = "0.4"
rand_xorshift = "0.1"
rand = "0.7"
rand_core = "0.5"
rand_xorshift = "0.2"
serde = { version = "1", features = ["derive"] }
stdinout = "0.4"
toml = "0.5"
zipf = "5"
zipf = "6"

[build-dependencies]
git2 = "0.10"

[dev-dependencies]
lazy_static = "1"
maplit = "1"
rand_xorshift = "0.1"
maplit = "1"
2 changes: 1 addition & 1 deletion src/subcommands/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use finalfrontier::{
SimpleVocabConfig, SubwordVocab, Vocab, VocabBuilder, WriteModelBinary, SGD,
};
use finalfusion::prelude::VocabWrap;
use rand::{FromEntropy, Rng};
use rand::{Rng, SeedableRng};
use rand_xorshift::XorShiftRng;
use serde::Serialize;
use stdinout::OrExit;
Expand Down
2 changes: 1 addition & 1 deletion src/subcommands/skipgram.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use finalfrontier::{
SubwordVocab, Vocab, VocabBuilder, WriteModelBinary, SGD,
};
use finalfusion::prelude::VocabWrap;
use rand::{FromEntropy, Rng};
use rand::{Rng, SeedableRng};
use rand_xorshift::XorShiftRng;
use serde::Serialize;
use stdinout::OrExit;
Expand Down
2 changes: 1 addition & 1 deletion src/train_model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ pub trait NegativeSamples {
mod tests {
use finalfusion::subword::FinalfusionHashIndexer;
use ndarray::Array2;
use rand::FromEntropy;
use rand::SeedableRng;
use rand_xorshift::XorShiftRng;

use super::TrainModel;
Expand Down
6 changes: 3 additions & 3 deletions src/util.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use rand::{FromEntropy, SeedableRng};
use rand::SeedableRng;
use rand_core::{self, RngCore};
use serde::Serialize;

Expand Down Expand Up @@ -55,7 +55,7 @@ where

impl<R> Clone for ReseedOnCloneRng<R>
where
R: RngCore + FromEntropy + SeedableRng,
R: RngCore + SeedableRng,
{
fn clone(&self) -> Self {
ReseedOnCloneRng(R::from_entropy())
Expand Down Expand Up @@ -83,7 +83,7 @@ pub use self::test::*;
#[cfg(test)]
mod test {
use ndarray::{ArrayView, Dimension};
use rand::{FromEntropy, SeedableRng};
use rand::SeedableRng;
use rand_core::{self, impls, le, RngCore};

use super::ReseedOnCloneRng;
Expand Down

0 comments on commit 9838f33

Please sign in to comment.