Move rand distr

.github/workflows/benches.yml

@@ -5,13 +5,11 @@ on:
     branches: [ master ]
     paths-ignore:
       - "**.md"
-      - "distr_test/**"
       - "examples/**"
   pull_request:
     branches: [ master ]
     paths-ignore:
       - "**.md"
-      - "distr_test/**"
       - "examples/**"
 
 defaults:

.github/workflows/test.yml

@@ -6,13 +6,11 @@ on:
     paths-ignore:
       - "**.md"
       - "benches/**"
-      - "distr_test/**"
   pull_request:
     branches: [ master, '0.[0-9]+' ]
     paths-ignore:
       - "**.md"
       - "benches/**"
-      - "distr_test/**"
 
 permissions:
   contents: read #  to fetch code (actions/checkout)
@@ -47,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_distr
-        run: cargo doc --all-features --package rand_distr --no-deps
       - name: rand_chacha
         run: cargo doc --all-features --package rand_chacha --no-deps
       - name: rand_pcg
@@ -122,11 +118,6 @@ jobs:
           cargo test --target ${{ matrix.target }} --manifest-path rand_core/Cargo.toml
           cargo test --target ${{ matrix.target }} --manifest-path rand_core/Cargo.toml --no-default-features
           cargo test --target ${{ matrix.target }} --manifest-path rand_core/Cargo.toml --no-default-features --features=os_rng
-      - name: Test rand_distr
-        run: |
-          cargo test --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --features=serde
-          cargo test --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --no-default-features
-          cargo test --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --no-default-features --features=std,std_math
       - name: Test rand_pcg
         run: cargo test --target ${{ matrix.target }} --manifest-path rand_pcg/Cargo.toml --features=serde
       - name: Test rand_chacha
@@ -162,7 +153,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_core/Cargo.toml
-          cross test --no-fail-fast --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --features=serde
           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
 
@@ -182,7 +172,6 @@ jobs:
           cargo miri test --manifest-path rand_core/Cargo.toml
           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_distr/Cargo.toml # no unsafe and lots of slow tests
           cargo miri test --manifest-path rand_pcg/Cargo.toml --features=serde
           cargo miri test --manifest-path rand_chacha/Cargo.toml --no-default-features
 

Cargo.toml

@@ -65,7 +65,6 @@ log = ["dep:log"]
 [workspace]
 members = [
     "rand_core",
-    "rand_distr",
     "rand_chacha",
     "rand_pcg",
 ]

benches/Cargo.toml

@@ -10,7 +10,6 @@ publish = false
 rand = { path = "..", features = ["small_rng", "nightly"] }
 rand_pcg = { path = "../rand_pcg" }
 rand_chacha = { path = "../rand_chacha" }
-rand_distr = { path = "../rand_distr" }
 criterion = "0.5"
 criterion-cycles-per-byte = "0.6"
 
@@ -22,10 +21,6 @@ harness = false
 name = "bool"
 harness = false
 
-[[bench]]
-name = "distr"
-harness = false
-
 [[bench]]
 name = "generators"
 harness = false
@@ -49,7 +44,3 @@ harness = false
 [[bench]]
 name = "uniform_float"
 harness = false
-
-[[bench]]
-name = "weighted"
-harness = false

benches/benches/standard.rs

@@ -9,9 +9,8 @@
 use core::time::Duration;
 use criterion::measurement::WallTime;
 use criterion::{criterion_group, criterion_main, BenchmarkGroup, Criterion};
-use rand::distr::{Alphanumeric, StandardUniform};
+use rand::distr::{Alphanumeric, Open01, OpenClosed01, StandardUniform};
 use rand::prelude::*;
-use rand_distr::{Open01, OpenClosed01};
 use rand_pcg::Pcg64Mcg;
 
 criterion_group!(
@@ -25,7 +24,7 @@ fn bench_ty<T, D>(g: &mut BenchmarkGroup<WallTime>, name: &str)
 where
     D: Distribution<T> + Default,
 {
-    g.throughput(criterion::Throughput::Bytes(size_of::<T>() as u64));
+    g.throughput(criterion::Throughput::Bytes(core::mem::size_of::<T>() as u64));
     g.bench_function(name, |b| {
         let mut rng = Pcg64Mcg::from_rng(&mut rand::rng());