Remove rand_chacha (#1658)

Author: dhardy

.github/workflows/test.yml

@@ -45,8 +45,6 @@ jobs:
           toolchain: nightly
       - name: rand
         run: cargo doc --all-features --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
 
@@ -112,8 +110,6 @@ jobs:
           cargo test --target ${{ matrix.target }} --features=serde,log,small_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 }}
@@ -145,7 +141,6 @@ jobs:
           cross test --no-fail-fast --target ${{ matrix.target }} --features=serde,log,small_rng
           cross test --no-fail-fast --target ${{ matrix.target }} --examples
           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
@@ -161,7 +156,6 @@ jobs:
           cargo miri test --no-default-features --lib --tests
           cargo miri test --features=log,small_rng
           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

Cargo.lock

@@ -67,7 +67,6 @@ log = ["dep:log"]
 
 [workspace]
 members = [
-    "rand_chacha",
     "rand_pcg",
 ]
 exclude = ["benches", "distr_test"]

Cargo.toml

@@ -76,7 +76,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

SECURITY.md

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

benches/Cargo.lock

@@ -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::ReseedingRng;
 use rand::rngs::SysRng;
-use rand_chacha::rand_core::UnwrapErr;
-use rand_chacha::{ChaCha8Rng, ChaCha12Rng, ChaCha20Core, ChaCha20Rng};
 use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};
 
 criterion_group!(

benches/Cargo.toml

@@ -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/generators.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/seq_choose.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};