Skip to content

Bump rand from 0.8 to 0.9 #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump rand from 0.8 to 0.9 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ default-features = false

[dependencies.rand]
optional = true
version = "0.8"
version = "0.9"
default-features = false

[features]
Expand Down
33 changes: 14 additions & 19 deletions src/crand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

use crate::Complex;
use num_traits::Num;
use rand::distributions::Standard;
use rand::distr::StandardUniform;
use rand::prelude::*;

impl<T> Distribution<Complex<T>> for Standard
impl<T> Distribution<Complex<T>> for StandardUniform
where
T: Num + Clone,
Standard: Distribution<T>,
StandardUniform: Distribution<T>,
{
fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Complex<T> {
Complex::new(self.sample(rng), self.sample(rng))
Expand Down Expand Up @@ -68,11 +68,6 @@ fn test_rng() -> impl RngCore {
chunk.copy_from_slice(slice)
}
}

fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand::Error> {
self.fill_bytes(dest);
Ok(())
}
}

XorShiftStar {
Expand All @@ -84,7 +79,7 @@ fn test_rng() -> impl RngCore {
fn standard_f64() {
let mut rng = test_rng();
for _ in 0..100 {
let c: Complex<f64> = rng.gen();
let c: Complex<f64> = rng.random();
assert!(c.re >= 0.0 && c.re < 1.0);
assert!(c.im >= 0.0 && c.im < 1.0);
}
Expand All @@ -93,7 +88,7 @@ fn standard_f64() {
#[test]
fn generic_standard_f64() {
let mut rng = test_rng();
let dist = ComplexDistribution::new(Standard, Standard);
let dist = ComplexDistribution::new(StandardUniform, StandardUniform);
for _ in 0..100 {
let c: Complex<f64> = rng.sample(dist);
assert!(c.re >= 0.0 && c.re < 1.0);
Expand All @@ -103,11 +98,11 @@ fn generic_standard_f64() {

#[test]
fn generic_uniform_f64() {
use rand::distributions::Uniform;
use rand::distr::Uniform;

let mut rng = test_rng();
let re = Uniform::new(-100.0, 0.0);
let im = Uniform::new(0.0, 100.0);
let re = Uniform::new(-100.0, 0.0).unwrap();
let im = Uniform::new(0.0, 100.0).unwrap();
let dist = ComplexDistribution::new(re, im);
for _ in 0..100 {
// no type annotation required, since `Uniform` only produces one type.
Expand All @@ -119,11 +114,11 @@ fn generic_uniform_f64() {

#[test]
fn generic_mixed_f64() {
use rand::distributions::Uniform;
use rand::distr::Uniform;

let mut rng = test_rng();
let re = Uniform::new(-100.0, 0.0);
let dist = ComplexDistribution::new(re, Standard);
let re = Uniform::new(-100.0, 0.0).unwrap();
let dist = ComplexDistribution::new(re, StandardUniform);
for _ in 0..100 {
// no type annotation required, since `Uniform` only produces one type.
let c = rng.sample(dist);
Expand All @@ -134,11 +129,11 @@ fn generic_mixed_f64() {

#[test]
fn generic_uniform_i32() {
use rand::distributions::Uniform;
use rand::distr::Uniform;

let mut rng = test_rng();
let re = Uniform::new(-100, 0);
let im = Uniform::new(0, 100);
let re = Uniform::new(-100, 0).unwrap();
let im = Uniform::new(0, 100).unwrap();
let dist = ComplexDistribution::new(re, im);
for _ in 0..100 {
// no type annotation required, since `Uniform` only produces one type.
Expand Down