Merge pull request #824 from vks/edition-2018

Use Rust 2018 and remove `build.rs`

Author: dhardy

Cargo.toml

@@ -12,9 +12,9 @@ Random number generators and other randomness functionality.
 """
 keywords = ["random", "rng"]
 categories = ["algorithms", "no-std"]
-build = "build.rs"
 exclude = ["/utils/*", "/.travis.yml", "/appveyor.yml", ".gitignore"]
 autobenches = true
+edition = "2018"
 
 [badges]
 travis-ci = { repository = "rust-random/rand" }
@@ -86,8 +86,5 @@ rand_xoshiro = { path = "rand_xoshiro", version = "0.3" }
 rand_isaac = { path = "rand_isaac", version = "0.2" }
 rand_xorshift = { path = "rand_xorshift", version = "0.2" }
 
-[build-dependencies]
-autocfg = "0.1"
-
 [package.metadata.docs.rs]
 all-features = true

benches/generators.rs

@@ -10,13 +10,6 @@
 #![allow(non_snake_case)]
 
 extern crate test;
-extern crate rand;
-extern crate rand_isaac;
-extern crate rand_chacha;
-extern crate rand_hc;
-extern crate rand_pcg;
-extern crate rand_xorshift;
-extern crate rand_xoshiro;
 
 const RAND_BENCH_N: u64 = 1000;
 const BYTES_LEN: usize = 1024;

benches/misc.rs

@@ -9,8 +9,6 @@
 #![feature(test)]
 
 extern crate test;
-extern crate rand;
-extern crate rand_pcg;
 
 const RAND_BENCH_N: u64 = 1000;
 
@@ -25,7 +23,7 @@ fn misc_gen_bool_const(b: &mut Bencher) {
     let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
     b.iter(|| {
         let mut accum = true;
-        for _ in 0..::RAND_BENCH_N {
+        for _ in 0..crate::RAND_BENCH_N {
             accum ^= rng.gen_bool(0.18);
         }
         accum
@@ -38,7 +36,7 @@ fn misc_gen_bool_var(b: &mut Bencher) {
     b.iter(|| {
         let mut accum = true;
         let mut p = 0.18;
-        for _ in 0..::RAND_BENCH_N {
+        for _ in 0..crate::RAND_BENCH_N {
             accum ^= rng.gen_bool(p);
             p += 0.0001;
         }
@@ -51,7 +49,7 @@ fn misc_gen_ratio_const(b: &mut Bencher) {
     let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
     b.iter(|| {
         let mut accum = true;
-        for _ in 0..::RAND_BENCH_N {
+        for _ in 0..crate::RAND_BENCH_N {
             accum ^= rng.gen_ratio(2, 3);
         }
         accum
@@ -63,7 +61,7 @@ fn misc_gen_ratio_var(b: &mut Bencher) {
     let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
     b.iter(|| {
         let mut accum = true;
-        for i in 2..(::RAND_BENCH_N as u32 + 2) {
+        for i in 2..(crate::RAND_BENCH_N as u32 + 2) {
             accum ^= rng.gen_ratio(i, i + 1);
         }
         accum
@@ -76,7 +74,7 @@ fn misc_bernoulli_const(b: &mut Bencher) {
     b.iter(|| {
         let d = rand::distributions::Bernoulli::new(0.18).unwrap();
         let mut accum = true;
-        for _ in 0..::RAND_BENCH_N {
+        for _ in 0..crate::RAND_BENCH_N {
             accum ^= rng.sample(d);
         }
         accum
@@ -89,7 +87,7 @@ fn misc_bernoulli_var(b: &mut Bencher) {
     b.iter(|| {
         let mut accum = true;
         let mut p = 0.18;
-        for _ in 0..::RAND_BENCH_N {
+        for _ in 0..crate::RAND_BENCH_N {
             let d = Bernoulli::new(p).unwrap();
             accum ^= rng.sample(d);
             p += 0.0001;

benches/seq.rs

@@ -10,8 +10,6 @@
 #![allow(non_snake_case)]
 
 extern crate test;
-extern crate rand;
-extern crate rand_pcg;
 
 use test::Bencher;
 
@@ -49,7 +47,7 @@ fn seq_slice_choose_1_of_1000(b: &mut Bencher) {
         }
         s
     });
-    b.bytes = size_of::<usize>() as u64 * ::RAND_BENCH_N;
+    b.bytes = size_of::<usize>() as u64 * crate::RAND_BENCH_N;
 }
 
 macro_rules! seq_slice_choose_multiple {
@@ -91,7 +89,7 @@ fn seq_iter_choose_from_1000(b: &mut Bencher) {
         }
         s
     });
-    b.bytes = size_of::<usize>() as u64 * ::RAND_BENCH_N;
+    b.bytes = size_of::<usize>() as u64 * crate::RAND_BENCH_N;
 }
 
 #[derive(Clone)]

build.rs

@@ -26,9 +26,6 @@
 
 #![cfg(feature = "std")]
 
-
-extern crate rand;
-
 use rand::distributions::{Distribution, Uniform};
 
 fn main() {

examples/monte-carlo.rs

@@ -28,9 +28,6 @@
 
 #![cfg(feature = "std")]
 
-
-extern crate rand;
-
 use rand::distributions::{Distribution, Uniform};
 use rand::Rng;
 

examples/monty-hall.rs

@@ -12,7 +12,7 @@ ChaCha random number generator
 """
 keywords = ["random", "rng", "chacha"]
 categories = ["algorithms", "no-std"]
-build = "build.rs"
+edition = "2018"
 
 [badges]
 travis-ci = { repository = "rust-random/rand" }
@@ -22,9 +22,6 @@ appveyor = { repository = "rust-random/rand" }
 rand_core = { path = "../rand_core", version = "0.5" }
 c2-chacha = { version = "0.2.2", default-features = false }
 
-[build-dependencies]
-autocfg = "0.1"
-
 [features]
 default = ["std", "simd"]
 std = ["c2-chacha/std"]

rand_chacha/Cargo.toml

@@ -18,12 +18,11 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-extern crate c2_chacha;
-pub extern crate rand_core;
+pub use rand_core;
 
 mod chacha;
 
-pub use chacha::{ChaCha12Core, ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Core, ChaCha8Rng};
+pub use crate::chacha::{ChaCha12Core, ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Core, ChaCha8Rng};
 
 /// ChaCha with 20 rounds
 pub type ChaChaRng = ChaCha20Rng;