Replace rand_chacha references

Author: dhardy

.github/workflows/test.yml

@@ -45,8 +45,6 @@ jobs:
         run: cargo doc --all-features --no-deps
       - name: rand_core
         run: cargo doc --all-features --package rand_core --no-deps
-      - name: rand_chacha
-        run: cargo doc --all-features --package rand_chacha --no-deps
       - name: rand_pcg
         run: cargo doc --all-features --package rand_pcg --no-deps
 
@@ -139,8 +137,6 @@ jobs:
           cargo test --target ${{ matrix.target }} --manifest-path rand_core/Cargo.toml --no-default-features --features=os_rng
       - name: Test rand_pcg
         run: cargo test --target ${{ matrix.target }} --manifest-path rand_pcg/Cargo.toml --features=serde
-      - name: Test rand_chacha
-        run: cargo test --target ${{ matrix.target }} --manifest-path rand_chacha/Cargo.toml --features=serde
 
   test-cross:
     runs-on: ${{ matrix.os }}
@@ -173,7 +169,6 @@ jobs:
           cross test --no-fail-fast --target ${{ matrix.target }} --examples
           cross test --no-fail-fast --target ${{ matrix.target }} --manifest-path rand_core/Cargo.toml
           cross test --no-fail-fast --target ${{ matrix.target }} --manifest-path rand_pcg/Cargo.toml --features=serde
-          cross test --no-fail-fast --target ${{ matrix.target }} --manifest-path rand_chacha/Cargo.toml
 
   test-miri:
     runs-on: ubuntu-latest
@@ -192,7 +187,6 @@ jobs:
           cargo miri test --manifest-path rand_core/Cargo.toml --features=serde
           cargo miri test --manifest-path rand_core/Cargo.toml --no-default-features
           cargo miri test --manifest-path rand_pcg/Cargo.toml --features=serde
-          cargo miri test --manifest-path rand_chacha/Cargo.toml --no-default-features
 
   test-no-std:
     runs-on: ubuntu-latest

SECURITY.md

@@ -77,7 +77,7 @@ distribution.
 
 We aim to provide security fixes in the form of a new patch version for the
 latest release version of `rand` and its dependencies `rand_core` and
-`rand_chacha`, as well as for prior major and minor releases which were, at some
+`chacha20`, as well as for prior major and minor releases which were, at some
 time during the previous 12 months, the latest release version.
 
 ## Reporting a Vulnerability

benches/Cargo.toml

@@ -18,7 +18,7 @@ rand_core = { path = "../rand_core" }
 [dev-dependencies]
 rand = { path = "..", features = ["small_rng", "nightly"] }
 rand_pcg = { path = "../rand_pcg" }
-rand_chacha = { path = "../rand_chacha" }
+chacha20 = { version = "=0.10.0-rc.2", default-features = false, features = ["rng"] }
 criterion = "0.5"
 criterion-cycles-per-byte = "0.6"
 

benches/benches/generators.rs

@@ -6,14 +6,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use chacha20::rand_core::UnwrapErr;
+use chacha20::{ChaCha8Rng, ChaCha12Rng, ChaCha20Core, ChaCha20Rng};
 use core::time::Duration;
 use criterion::measurement::WallTime;
 use criterion::{BenchmarkGroup, Criterion, black_box, criterion_group, criterion_main};
 use rand::prelude::*;
 use rand::rngs::OsRng;
 use rand::rngs::ReseedingRng;
-use rand_chacha::rand_core::UnwrapErr;
-use rand_chacha::{ChaCha8Rng, ChaCha12Rng, ChaCha20Core, ChaCha20Rng};
 use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};
 
 criterion_group!(

benches/benches/seq_choose.rs

@@ -94,7 +94,7 @@ pub fn bench(c: &mut Criterion) {
         b.iter(|| x.iter().cloned().sample_fill(&mut rng, &mut buf))
     });
 
-    bench_rng::<rand_chacha::ChaCha20Rng>(c, "ChaCha20");
+    bench_rng::<chacha20::ChaCha20Rng>(c, "ChaCha20");
     bench_rng::<rand_pcg::Pcg32>(c, "Pcg32");
     bench_rng::<rand_pcg::Pcg64>(c, "Pcg64");
 }

benches/benches/shuffle.rs

@@ -30,7 +30,7 @@ pub fn bench(c: &mut Criterion) {
         })
     });
 
-    bench_rng::<rand_chacha::ChaCha12Rng>(c, "ChaCha12");
+    bench_rng::<chacha20::ChaCha12Rng>(c, "ChaCha12");
     bench_rng::<rand_pcg::Pcg32>(c, "Pcg32");
     bench_rng::<rand_pcg::Pcg64>(c, "Pcg64");
 }

benches/benches/uniform.rs

@@ -10,11 +10,11 @@
 
 #![cfg_attr(feature = "simd_support", feature(portable_simd))]
 
+use chacha20::ChaCha8Rng;
 use core::time::Duration;
 use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use rand::distr::uniform::{SampleRange, Uniform};
 use rand::prelude::*;
-use rand_chacha::ChaCha8Rng;
 use rand_pcg::{Pcg32, Pcg64};
 #[cfg(feature = "simd_support")]
 use std::simd::{Simd, num::SimdUint};

benches/benches/uniform_float.rs

@@ -12,11 +12,11 @@
 //!
 //! -   sample: current method: (x12 - 1.0) * (b - a) + a
 
+use chacha20::ChaCha8Rng;
 use core::time::Duration;
 use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use rand::distr::uniform::{SampleUniform, Uniform, UniformSampler};
 use rand::prelude::*;
-use rand_chacha::ChaCha8Rng;
 use rand_pcg::{Pcg32, Pcg64};
 
 const WARM_UP_TIME: Duration = Duration::from_millis(1000);

rand_pcg/src/lib.rs

@@ -77,7 +77,6 @@
 //! [`SeedableRng::from_rng`]: rand_core::SeedableRng#method.from_rng
 //! [`rand::rng`]: https://docs.rs/rand/latest/rand/fn.rng.html
 //! [`rand::Rng`]: https://docs.rs/rand/latest/rand/trait.Rng.html
-//! [`rand_chacha::ChaCha8Rng`]: https://docs.rs/rand_chacha/latest/rand_chacha/struct.ChaCha8Rng.html
 
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",

src/rngs/mod.rs

@@ -55,8 +55,9 @@
 //! -   The [`rand_jitter`] crate provides a user-space implementation of
 //!     entropy harvesting from CPU timer jitter, but is very slow and has
 //!     [security issues](https://github.com/rust-random/rand/issues/699).
-//! -   The [`rand_chacha`] crate provides portable implementations of
-//!     generators derived from the [ChaCha] family of stream ciphers
+//! -   The [`chacha20`] and [`rand_chacha`] crates provides portable
+//!     implementations of generators derived from the [ChaCha] family of
+//!     stream ciphers
 //! -   The [`rand_pcg`] crate provides portable implementations of a subset
 //!     of the [PCG] family of small, insecure generators
 //! -   The [`rand_xoshiro`] crate provides portable implementations of the
@@ -83,6 +84,7 @@
 //! [`SeedableRng`]: crate::SeedableRng
 //! [`rdrand`]: https://crates.io/crates/rdrand
 //! [`rand_jitter`]: https://crates.io/crates/rand_jitter
+//! [`chacha20`]: https://crates.io/crates/chacha20
 //! [`rand_chacha`]: https://crates.io/crates/rand_chacha
 //! [`rand_pcg`]: https://crates.io/crates/rand_pcg
 //! [`rand_xoshiro`]: https://crates.io/crates/rand_xoshiro