Skip to content

Add TryRngCore and TryCryptoRng traits#1424

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

Merged
dhardy merged 5 commits into from
May 8, 2024
Merged

Add TryRngCore and TryCryptoRng traits #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
515ad2c
Rework fallability
newpavlov May 7, 2024
6466cc8
Merge branch 'master' into try_traits
newpavlov May 7, 2024
cafe56f
fix benches
newpavlov May 7, 2024
9d5735b
Fix warnings in benches
newpavlov May 7, 2024
a28d242
Improve `rand_core` docs
newpavlov May 8, 2024
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 README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,7 @@ compiler versions will be compatible. This is especially true of Rand's
experimental `simd_support` feature.

Rand supports limited functionality in `no_std` mode (enabled via
`default-features = false`). In this case, `OsRng` and `from_entropy` are
`default-features = false`). In this case, `OsRng` and `from_os_rng` are
unavailable (unless `getrandom` is enabled), large parts of `seq` are
unavailable (unless `alloc` is enabled), and `thread_rng` and `random` are
unavailable.
Expand Down
22 changes: 11 additions & 11 deletions benches/benches/base_distributions.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ macro_rules! distr_int {
($fnn:ident, $ty:ty, $distr:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();
let distr = $distr;

b.iter(|| {
Expand All@@ -52,7 +52,7 @@ macro_rules! distr_nz_int {
($fnn:ident, $tynz:ty, $ty:ty, $distr:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();
let distr = $distr;

b.iter(|| {
Expand All@@ -72,7 +72,7 @@ macro_rules! distr_float {
($fnn:ident, $ty:ty, $distr:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();
let distr = $distr;

b.iter(|| {
Expand All@@ -92,7 +92,7 @@ macro_rules! distr_duration {
($fnn:ident, $distr:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();
let distr = $distr;

b.iter(|| {
Expand All@@ -114,7 +114,7 @@ macro_rules! distr {
($fnn:ident, $ty:ty, $distr:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();
let distr = $distr;

b.iter(|| {
Expand DownExpand Up@@ -191,15 +191,15 @@ macro_rules! gen_range_int {
($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();

b.iter(|| {
let mut high = $high;
let mut accum: $ty = 0;
for _ in 0..RAND_BENCH_N {
accum = accum.wrapping_add(rng.gen_range($low..high));
// force recalculation of range each time
high = high.wrapping_add(1) & core::$ty::MAX;
high = high.wrapping_add(1) & $ty::MAX;
}
accum
});
Expand DownExpand Up@@ -230,7 +230,7 @@ macro_rules! gen_range_float {
($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();

b.iter(|| {
let mut high = $high;
Expand DownExpand Up@@ -267,7 +267,7 @@ macro_rules! uniform_sample {
($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();
let low = black_box($low);
let high = black_box($high);
b.iter(|| {
Expand All@@ -286,7 +286,7 @@ macro_rules! uniform_inclusive {
($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();
let low = black_box($low);
let high = black_box($high);
b.iter(|| {
Expand All@@ -306,7 +306,7 @@ macro_rules! uniform_single {
($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_entropy();
let mut rng = Pcg64Mcg::from_os_rng();
let low = black_box($low);
let high = black_box($high);
b.iter(|| {
Expand Down
65 changes: 33 additions & 32 deletions benches/benches/generators.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ const RAND_BENCH_N: u64 = 1000;
const BYTES_LEN: usize = 1024;

use core::mem::size_of;
use rand_chacha::rand_core::UnwrapErr;
use test::{black_box, Bencher};

use rand::prelude::*;
use rand::rngs::ReseedingRng;
use rand::rngs::{mock::StepRng, OsRng};
use rand_chacha::{ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Rng};
use rand_pcg::{Pcg32, Pcg64, Pcg64Mcg, Pcg64Dxsm};
use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};

macro_rules! gen_bytes {
($fnn:ident, $gen:expr) => {
Expand All@@ -41,17 +42,17 @@ macro_rules! gen_bytes {
}

gen_bytes!(gen_bytes_step, StepRng::new(0, 1));
gen_bytes!(gen_bytes_pcg32, Pcg32::from_entropy());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_entropy());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_entropy());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_entropy());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_entropy());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_entropy());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_entropy());
gen_bytes!(gen_bytes_std, StdRng::from_entropy());
gen_bytes!(gen_bytes_pcg32, Pcg32::from_os_rng());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_os_rng());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_os_rng());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_os_rng());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_os_rng());
gen_bytes!(gen_bytes_std, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_bytes!(gen_bytes_small, SmallRng::from_thread_rng());
gen_bytes!(gen_bytes_os, OsRng);
gen_bytes!(gen_bytes_os, UnwrapErr(OsRng));
gen_bytes!(gen_bytes_thread, thread_rng());

macro_rules! gen_uint {
Expand All@@ -62,7 +63,7 @@ macro_rules! gen_uint {
b.iter(|| {
let mut accum: $ty = 0;
for _ in 0..RAND_BENCH_N {
accum = accum.wrapping_add(rng.gen::<$ty>());
accum = accum.wrapping_add(rng.random::<$ty>());
}
accum
});
Expand All@@ -72,40 +73,40 @@ macro_rules! gen_uint {
}

gen_uint!(gen_u32_step, u32, StepRng::new(0, 1));
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_entropy());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_entropy());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_entropy());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_entropy());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_entropy());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_entropy());
gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_os_rng());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_os_rng());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u32_std, u32, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u32_small, u32, SmallRng::from_thread_rng());
gen_uint!(gen_u32_os, u32, OsRng);
gen_uint!(gen_u32_os, u32, UnwrapErr(OsRng));
gen_uint!(gen_u32_thread, u32, thread_rng());

gen_uint!(gen_u64_step, u64, StepRng::new(0, 1));
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_entropy());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_entropy());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_entropy());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_entropy());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_entropy());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_entropy());
gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_os_rng());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_os_rng());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u64_std, u64, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u64_small, u64, SmallRng::from_thread_rng());
gen_uint!(gen_u64_os, u64, OsRng);
gen_uint!(gen_u64_os, u64, UnwrapErr(OsRng));
gen_uint!(gen_u64_thread, u64, thread_rng());

macro_rules! init_gen {
($fnn:ident, $gen:ident) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = Pcg32::from_entropy();
let mut rng = Pcg32::from_os_rng();
b.iter(|| {
let r2 = $gen::from_rng(&mut rng).unwrap();
let r2 = $gen::from_rng(&mut rng);
r2
});
}
Expand All@@ -125,7 +126,7 @@ macro_rules! reseeding_bytes {
($fnn:ident, $thresh:expr) => {
#[bench]
fn $fnn(b: &mut Bencher) {
let mut rng = ReseedingRng::new(ChaCha20Core::from_entropy(), $thresh * 1024, OsRng);
let mut rng = ReseedingRng::new(ChaCha20Core::from_os_rng(), $thresh * 1024, OsRng);
let mut buf = [0u8; RESEEDING_BYTES_LEN];
b.iter(|| {
for _ in 0..RESEEDING_BENCH_N {
Expand Down
28 changes: 14 additions & 14 deletions benches/benches/misc.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use rand_pcg::{Pcg32, Pcg64Mcg};

#[bench]
fn misc_gen_bool_const(b: &mut Bencher) {
let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg32::from_rng(&mut thread_rng());
b.iter(|| {
let mut accum = true;
for _ in 0..RAND_BENCH_N {
Expand All@@ -32,7 +32,7 @@ fn misc_gen_bool_const(b: &mut Bencher) {

#[bench]
fn misc_gen_bool_var(b: &mut Bencher) {
let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg32::from_rng(&mut thread_rng());
b.iter(|| {
let mut accum = true;
let mut p = 0.18;
Expand All@@ -46,7 +46,7 @@ fn misc_gen_bool_var(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_const(b: &mut Bencher) {
let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg32::from_rng(&mut thread_rng());
b.iter(|| {
let mut accum = true;
for _ in 0..RAND_BENCH_N {
Expand All@@ -58,7 +58,7 @@ fn misc_gen_ratio_const(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_var(b: &mut Bencher) {
let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg32::from_rng(&mut thread_rng());
b.iter(|| {
let mut accum = true;
for i in 2..(RAND_BENCH_N as u32 + 2) {
Expand All@@ -70,7 +70,7 @@ fn misc_gen_ratio_var(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_const(b: &mut Bencher) {
let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg32::from_rng(&mut thread_rng());
b.iter(|| {
let d = Bernoulli::new(0.18).unwrap();
let mut accum = true;
Expand All@@ -83,7 +83,7 @@ fn misc_bernoulli_const(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_var(b: &mut Bencher) {
let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg32::from_rng(&mut thread_rng());
b.iter(|| {
let mut accum = true;
let mut p = 0.18;
Expand All@@ -99,7 +99,7 @@ fn misc_bernoulli_var(b: &mut Bencher) {
#[bench]
fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {
use core::iter;
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
b.iter(|| {
let v: Vec<u16> = iter::repeat(()).map(|()| rng.random()).take(512).collect();
v
Expand All@@ -109,7 +109,7 @@ fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_sample_iter(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
b.iter(|| {
let v: Vec<u16> = Standard.sample_iter(&mut rng).take(512).collect();
v
Expand All@@ -119,7 +119,7 @@ fn gen_1kb_u16_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_gen_array(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
b.iter(|| {
// max supported array length is 32!
let v: [[u16; 32]; 16] = rng.random();
Expand All@@ -130,7 +130,7 @@ fn gen_1kb_u16_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_fill(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
let mut buf = [0u16; 512];
b.iter(|| {
rng.fill(&mut buf[..]);
Expand All@@ -142,7 +142,7 @@ fn gen_1kb_u16_fill(b: &mut Bencher) {
#[bench]
fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {
use core::iter;
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
b.iter(|| {
let v: Vec<u64> = iter::repeat(()).map(|()| rng.random()).take(128).collect();
v
Expand All@@ -152,7 +152,7 @@ fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_sample_iter(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
b.iter(|| {
let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
v
Expand All@@ -162,7 +162,7 @@ fn gen_1kb_u64_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_gen_array(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
b.iter(|| {
// max supported array length is 32!
let v: [[u64; 32]; 4] = rng.random();
Expand All@@ -173,7 +173,7 @@ fn gen_1kb_u64_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_fill(b: &mut Bencher) {
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
let mut buf = [0u64; 128];
b.iter(|| {
rng.fill(&mut buf[..]);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add `TryRngCore` and `TryCryptoRng` traits by newpavlov · Pull Request #1424 · rust-random/rand · GitHub
Skip to content
Add TryRngCore and TryCryptoRng traits#1424

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

 Merged

dhardy
merged 5 commits into

from

May 8, 2024
 Merged


Add TryRngCore and TryCryptoRng traits
#1424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
515ad2c

Rework fallability


newpavlov May 7, 2024
6466cc8

Merge branch 'master' into try_traits


newpavlov May 7, 2024
cafe56f

fix benches


newpavlov May 7, 2024
9d5735b

Fix warnings in benches


newpavlov May 7, 2024
a28d242

Improve `rand_core` docs


newpavlov May 8, 2024

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
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,7 @@ compiler versions will be compatible. This is especially true of Rand's
experimental `simd_support` feature.

Rand supports limited functionality in `no_std` mode (enabled via
`default-features = false`). In this case, `OsRng` and `from_entropy` are
`default-features = false`). In this case, `OsRng` and `from_os_rng` are
unavailable (unless `getrandom` is enabled), large parts of `seq` are
unavailable (unless `alloc` is enabled), and `thread_rng` and `random` are
unavailable.
Expand Down

22 changes: 11 additions & 11 deletions
benches/benches/base_distributions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ macro_rules! distr_int {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -52,7 +52,7 @@ macro_rules! distr_nz_int {
 ($fnn:ident, $tynz:ty, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -72,7 +72,7 @@ macro_rules! distr_float {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -92,7 +92,7 @@ macro_rules! distr_duration {
 ($fnn:ident, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -114,7 +114,7 @@ macro_rules! distr {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand DownExpand Up@@ -191,15 +191,15 @@ macro_rules! gen_range_int {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen_range($low..high));
 // force recalculation of range each time
 high = high.wrapping_add(1) & core::$ty::MAX;
 high = high.wrapping_add(1) & $ty::MAX;
 }
 accum
 });
Expand DownExpand Up@@ -230,7 +230,7 @@ macro_rules! gen_range_float {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
Expand DownExpand Up@@ -267,7 +267,7 @@ macro_rules! uniform_sample {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -286,7 +286,7 @@ macro_rules! uniform_inclusive {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -306,7 +306,7 @@ macro_rules! uniform_single {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand Down

65 changes: 33 additions & 32 deletions
benches/benches/generators.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ const RAND_BENCH_N: u64 = 1000;
const BYTES_LEN: usize = 1024;

use core::mem::size_of;
use rand_chacha::rand_core::UnwrapErr;
use test::{black_box, Bencher};

use rand::prelude::*;
use rand::rngs::ReseedingRng;
use rand::rngs::{mock::StepRng, OsRng};
use rand_chacha::{ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Rng};
use rand_pcg::{Pcg32, Pcg64, Pcg64Mcg, Pcg64Dxsm};
use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};

macro_rules! gen_bytes {
 ($fnn:ident, $gen:expr) => {
Expand All@@ -41,17 +42,17 @@ macro_rules! gen_bytes {
}

gen_bytes!(gen_bytes_step, StepRng::new(0, 1));
gen_bytes!(gen_bytes_pcg32, Pcg32::from_entropy());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_entropy());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_entropy());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_entropy());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_entropy());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_entropy());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_entropy());
gen_bytes!(gen_bytes_std, StdRng::from_entropy());
gen_bytes!(gen_bytes_pcg32, Pcg32::from_os_rng());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_os_rng());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_os_rng());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_os_rng());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_os_rng());
gen_bytes!(gen_bytes_std, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_bytes!(gen_bytes_small, SmallRng::from_thread_rng());
gen_bytes!(gen_bytes_os, OsRng);
gen_bytes!(gen_bytes_os, UnwrapErr(OsRng));
gen_bytes!(gen_bytes_thread, thread_rng());

macro_rules! gen_uint {
Expand All@@ -62,7 +63,7 @@ macro_rules! gen_uint {
 b.iter(|| {
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen::<$ty>());
 accum = accum.wrapping_add(rng.random::<$ty>());
 }
 accum
 });
Expand All@@ -72,40 +73,40 @@ macro_rules! gen_uint {
}

gen_uint!(gen_u32_step, u32, StepRng::new(0, 1));
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_entropy());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_entropy());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_entropy());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_entropy());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_entropy());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_entropy());
gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_os_rng());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_os_rng());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u32_std, u32, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u32_small, u32, SmallRng::from_thread_rng());
gen_uint!(gen_u32_os, u32, OsRng);
gen_uint!(gen_u32_os, u32, UnwrapErr(OsRng));
gen_uint!(gen_u32_thread, u32, thread_rng());

gen_uint!(gen_u64_step, u64, StepRng::new(0, 1));
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_entropy());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_entropy());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_entropy());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_entropy());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_entropy());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_entropy());
gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_os_rng());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_os_rng());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u64_std, u64, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u64_small, u64, SmallRng::from_thread_rng());
gen_uint!(gen_u64_os, u64, OsRng);
gen_uint!(gen_u64_os, u64, UnwrapErr(OsRng));
gen_uint!(gen_u64_thread, u64, thread_rng());

macro_rules! init_gen {
 ($fnn:ident, $gen:ident) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg32::from_entropy();
 let mut rng = Pcg32::from_os_rng();
 b.iter(|| {
 let r2 = $gen::from_rng(&mut rng).unwrap();
 let r2 = $gen::from_rng(&mut rng);
 r2
 });
 }
Expand All@@ -125,7 +126,7 @@ macro_rules! reseeding_bytes {
 ($fnn:ident, $thresh:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = ReseedingRng::new(ChaCha20Core::from_entropy(), $thresh * 1024, OsRng);
 let mut rng = ReseedingRng::new(ChaCha20Core::from_os_rng(), $thresh * 1024, OsRng);
 let mut buf = [0u8; RESEEDING_BYTES_LEN];
 b.iter(|| {
 for _ in 0..RESEEDING_BENCH_N {
Expand Down

28 changes: 14 additions & 14 deletions
benches/benches/misc.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use rand_pcg::{Pcg32, Pcg64Mcg};

#[bench]
fn misc_gen_bool_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -32,7 +32,7 @@ fn misc_gen_bool_const(b: &mut Bencher) {

#[bench]
fn misc_gen_bool_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -46,7 +46,7 @@ fn misc_gen_bool_var(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -58,7 +58,7 @@ fn misc_gen_ratio_const(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for i in 2..(RAND_BENCH_N as u32 + 2) {
Expand All@@ -70,7 +70,7 @@ fn misc_gen_ratio_var(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let d = Bernoulli::new(0.18).unwrap();
 let mut accum = true;
Expand All@@ -83,7 +83,7 @@ fn misc_bernoulli_const(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -99,7 +99,7 @@ fn misc_bernoulli_var(b: &mut Bencher) {
#[bench]
fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = iter::repeat(()).map(|()| rng.random()).take(512).collect();
 v
Expand All@@ -109,7 +109,7 @@ fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = Standard.sample_iter(&mut rng).take(512).collect();
 v
Expand All@@ -119,7 +119,7 @@ fn gen_1kb_u16_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u16; 32]; 16] = rng.random();
Expand All@@ -130,7 +130,7 @@ fn gen_1kb_u16_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u16; 512];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand All@@ -142,7 +142,7 @@ fn gen_1kb_u16_fill(b: &mut Bencher) {
#[bench]
fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = iter::repeat(()).map(|()| rng.random()).take(128).collect();
 v
Expand All@@ -152,7 +152,7 @@ fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
 v
Expand All@@ -162,7 +162,7 @@ fn gen_1kb_u64_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u64; 32]; 4] = rng.random();
Expand All@@ -173,7 +173,7 @@ fn gen_1kb_u64_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u64; 128];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add `TryRngCore` and `TryCryptoRng` traits by newpavlov · Pull Request #1424 · rust-random/rand · GitHub
Skip to content
Add TryRngCore and TryCryptoRng traits#1424

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

 Merged

dhardy
merged 5 commits into

from

May 8, 2024
 Merged


Add TryRngCore and TryCryptoRng traits
#1424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
515ad2c

Rework fallability


newpavlov May 7, 2024
6466cc8

Merge branch 'master' into try_traits


newpavlov May 7, 2024
cafe56f

fix benches


newpavlov May 7, 2024
9d5735b

Fix warnings in benches


newpavlov May 7, 2024
a28d242

Improve `rand_core` docs


newpavlov May 8, 2024

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
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,7 @@ compiler versions will be compatible. This is especially true of Rand's
experimental `simd_support` feature.

Rand supports limited functionality in `no_std` mode (enabled via
`default-features = false`). In this case, `OsRng` and `from_entropy` are
`default-features = false`). In this case, `OsRng` and `from_os_rng` are
unavailable (unless `getrandom` is enabled), large parts of `seq` are
unavailable (unless `alloc` is enabled), and `thread_rng` and `random` are
unavailable.
Expand Down

22 changes: 11 additions & 11 deletions
benches/benches/base_distributions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ macro_rules! distr_int {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -52,7 +52,7 @@ macro_rules! distr_nz_int {
 ($fnn:ident, $tynz:ty, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -72,7 +72,7 @@ macro_rules! distr_float {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -92,7 +92,7 @@ macro_rules! distr_duration {
 ($fnn:ident, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -114,7 +114,7 @@ macro_rules! distr {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand DownExpand Up@@ -191,15 +191,15 @@ macro_rules! gen_range_int {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen_range($low..high));
 // force recalculation of range each time
 high = high.wrapping_add(1) & core::$ty::MAX;
 high = high.wrapping_add(1) & $ty::MAX;
 }
 accum
 });
Expand DownExpand Up@@ -230,7 +230,7 @@ macro_rules! gen_range_float {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
Expand DownExpand Up@@ -267,7 +267,7 @@ macro_rules! uniform_sample {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -286,7 +286,7 @@ macro_rules! uniform_inclusive {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -306,7 +306,7 @@ macro_rules! uniform_single {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand Down

65 changes: 33 additions & 32 deletions
benches/benches/generators.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ const RAND_BENCH_N: u64 = 1000;
const BYTES_LEN: usize = 1024;

use core::mem::size_of;
use rand_chacha::rand_core::UnwrapErr;
use test::{black_box, Bencher};

use rand::prelude::*;
use rand::rngs::ReseedingRng;
use rand::rngs::{mock::StepRng, OsRng};
use rand_chacha::{ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Rng};
use rand_pcg::{Pcg32, Pcg64, Pcg64Mcg, Pcg64Dxsm};
use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};

macro_rules! gen_bytes {
 ($fnn:ident, $gen:expr) => {
Expand All@@ -41,17 +42,17 @@ macro_rules! gen_bytes {
}

gen_bytes!(gen_bytes_step, StepRng::new(0, 1));
gen_bytes!(gen_bytes_pcg32, Pcg32::from_entropy());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_entropy());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_entropy());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_entropy());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_entropy());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_entropy());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_entropy());
gen_bytes!(gen_bytes_std, StdRng::from_entropy());
gen_bytes!(gen_bytes_pcg32, Pcg32::from_os_rng());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_os_rng());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_os_rng());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_os_rng());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_os_rng());
gen_bytes!(gen_bytes_std, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_bytes!(gen_bytes_small, SmallRng::from_thread_rng());
gen_bytes!(gen_bytes_os, OsRng);
gen_bytes!(gen_bytes_os, UnwrapErr(OsRng));
gen_bytes!(gen_bytes_thread, thread_rng());

macro_rules! gen_uint {
Expand All@@ -62,7 +63,7 @@ macro_rules! gen_uint {
 b.iter(|| {
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen::<$ty>());
 accum = accum.wrapping_add(rng.random::<$ty>());
 }
 accum
 });
Expand All@@ -72,40 +73,40 @@ macro_rules! gen_uint {
}

gen_uint!(gen_u32_step, u32, StepRng::new(0, 1));
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_entropy());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_entropy());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_entropy());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_entropy());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_entropy());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_entropy());
gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_os_rng());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_os_rng());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u32_std, u32, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u32_small, u32, SmallRng::from_thread_rng());
gen_uint!(gen_u32_os, u32, OsRng);
gen_uint!(gen_u32_os, u32, UnwrapErr(OsRng));
gen_uint!(gen_u32_thread, u32, thread_rng());

gen_uint!(gen_u64_step, u64, StepRng::new(0, 1));
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_entropy());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_entropy());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_entropy());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_entropy());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_entropy());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_entropy());
gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_os_rng());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_os_rng());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u64_std, u64, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u64_small, u64, SmallRng::from_thread_rng());
gen_uint!(gen_u64_os, u64, OsRng);
gen_uint!(gen_u64_os, u64, UnwrapErr(OsRng));
gen_uint!(gen_u64_thread, u64, thread_rng());

macro_rules! init_gen {
 ($fnn:ident, $gen:ident) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg32::from_entropy();
 let mut rng = Pcg32::from_os_rng();
 b.iter(|| {
 let r2 = $gen::from_rng(&mut rng).unwrap();
 let r2 = $gen::from_rng(&mut rng);
 r2
 });
 }
Expand All@@ -125,7 +126,7 @@ macro_rules! reseeding_bytes {
 ($fnn:ident, $thresh:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = ReseedingRng::new(ChaCha20Core::from_entropy(), $thresh * 1024, OsRng);
 let mut rng = ReseedingRng::new(ChaCha20Core::from_os_rng(), $thresh * 1024, OsRng);
 let mut buf = [0u8; RESEEDING_BYTES_LEN];
 b.iter(|| {
 for _ in 0..RESEEDING_BENCH_N {
Expand Down

28 changes: 14 additions & 14 deletions
benches/benches/misc.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use rand_pcg::{Pcg32, Pcg64Mcg};

#[bench]
fn misc_gen_bool_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -32,7 +32,7 @@ fn misc_gen_bool_const(b: &mut Bencher) {

#[bench]
fn misc_gen_bool_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -46,7 +46,7 @@ fn misc_gen_bool_var(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -58,7 +58,7 @@ fn misc_gen_ratio_const(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for i in 2..(RAND_BENCH_N as u32 + 2) {
Expand All@@ -70,7 +70,7 @@ fn misc_gen_ratio_var(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let d = Bernoulli::new(0.18).unwrap();
 let mut accum = true;
Expand All@@ -83,7 +83,7 @@ fn misc_bernoulli_const(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -99,7 +99,7 @@ fn misc_bernoulli_var(b: &mut Bencher) {
#[bench]
fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = iter::repeat(()).map(|()| rng.random()).take(512).collect();
 v
Expand All@@ -109,7 +109,7 @@ fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = Standard.sample_iter(&mut rng).take(512).collect();
 v
Expand All@@ -119,7 +119,7 @@ fn gen_1kb_u16_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u16; 32]; 16] = rng.random();
Expand All@@ -130,7 +130,7 @@ fn gen_1kb_u16_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u16; 512];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand All@@ -142,7 +142,7 @@ fn gen_1kb_u16_fill(b: &mut Bencher) {
#[bench]
fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = iter::repeat(()).map(|()| rng.random()).take(128).collect();
 v
Expand All@@ -152,7 +152,7 @@ fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
 v
Expand All@@ -162,7 +162,7 @@ fn gen_1kb_u64_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u64; 32]; 4] = rng.random();
Expand All@@ -173,7 +173,7 @@ fn gen_1kb_u64_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u64; 128];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add `TryRngCore` and `TryCryptoRng` traits by newpavlov · Pull Request #1424 · rust-random/rand · GitHub
Skip to content
Add TryRngCore and TryCryptoRng traits#1424

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

 Merged

dhardy
merged 5 commits into

from

May 8, 2024
 Merged


Add TryRngCore and TryCryptoRng traits
#1424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
515ad2c

Rework fallability


newpavlov May 7, 2024
6466cc8

Merge branch 'master' into try_traits


newpavlov May 7, 2024
cafe56f

fix benches


newpavlov May 7, 2024
9d5735b

Fix warnings in benches


newpavlov May 7, 2024
a28d242

Improve `rand_core` docs


newpavlov May 8, 2024

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
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,7 @@ compiler versions will be compatible. This is especially true of Rand's
experimental `simd_support` feature.

Rand supports limited functionality in `no_std` mode (enabled via
`default-features = false`). In this case, `OsRng` and `from_entropy` are
`default-features = false`). In this case, `OsRng` and `from_os_rng` are
unavailable (unless `getrandom` is enabled), large parts of `seq` are
unavailable (unless `alloc` is enabled), and `thread_rng` and `random` are
unavailable.
Expand Down

22 changes: 11 additions & 11 deletions
benches/benches/base_distributions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ macro_rules! distr_int {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -52,7 +52,7 @@ macro_rules! distr_nz_int {
 ($fnn:ident, $tynz:ty, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -72,7 +72,7 @@ macro_rules! distr_float {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -92,7 +92,7 @@ macro_rules! distr_duration {
 ($fnn:ident, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -114,7 +114,7 @@ macro_rules! distr {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand DownExpand Up@@ -191,15 +191,15 @@ macro_rules! gen_range_int {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen_range($low..high));
 // force recalculation of range each time
 high = high.wrapping_add(1) & core::$ty::MAX;
 high = high.wrapping_add(1) & $ty::MAX;
 }
 accum
 });
Expand DownExpand Up@@ -230,7 +230,7 @@ macro_rules! gen_range_float {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
Expand DownExpand Up@@ -267,7 +267,7 @@ macro_rules! uniform_sample {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -286,7 +286,7 @@ macro_rules! uniform_inclusive {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -306,7 +306,7 @@ macro_rules! uniform_single {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand Down

65 changes: 33 additions & 32 deletions
benches/benches/generators.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ const RAND_BENCH_N: u64 = 1000;
const BYTES_LEN: usize = 1024;

use core::mem::size_of;
use rand_chacha::rand_core::UnwrapErr;
use test::{black_box, Bencher};

use rand::prelude::*;
use rand::rngs::ReseedingRng;
use rand::rngs::{mock::StepRng, OsRng};
use rand_chacha::{ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Rng};
use rand_pcg::{Pcg32, Pcg64, Pcg64Mcg, Pcg64Dxsm};
use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};

macro_rules! gen_bytes {
 ($fnn:ident, $gen:expr) => {
Expand All@@ -41,17 +42,17 @@ macro_rules! gen_bytes {
}

gen_bytes!(gen_bytes_step, StepRng::new(0, 1));
gen_bytes!(gen_bytes_pcg32, Pcg32::from_entropy());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_entropy());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_entropy());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_entropy());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_entropy());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_entropy());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_entropy());
gen_bytes!(gen_bytes_std, StdRng::from_entropy());
gen_bytes!(gen_bytes_pcg32, Pcg32::from_os_rng());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_os_rng());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_os_rng());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_os_rng());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_os_rng());
gen_bytes!(gen_bytes_std, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_bytes!(gen_bytes_small, SmallRng::from_thread_rng());
gen_bytes!(gen_bytes_os, OsRng);
gen_bytes!(gen_bytes_os, UnwrapErr(OsRng));
gen_bytes!(gen_bytes_thread, thread_rng());

macro_rules! gen_uint {
Expand All@@ -62,7 +63,7 @@ macro_rules! gen_uint {
 b.iter(|| {
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen::<$ty>());
 accum = accum.wrapping_add(rng.random::<$ty>());
 }
 accum
 });
Expand All@@ -72,40 +73,40 @@ macro_rules! gen_uint {
}

gen_uint!(gen_u32_step, u32, StepRng::new(0, 1));
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_entropy());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_entropy());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_entropy());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_entropy());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_entropy());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_entropy());
gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_os_rng());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_os_rng());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u32_std, u32, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u32_small, u32, SmallRng::from_thread_rng());
gen_uint!(gen_u32_os, u32, OsRng);
gen_uint!(gen_u32_os, u32, UnwrapErr(OsRng));
gen_uint!(gen_u32_thread, u32, thread_rng());

gen_uint!(gen_u64_step, u64, StepRng::new(0, 1));
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_entropy());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_entropy());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_entropy());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_entropy());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_entropy());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_entropy());
gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_os_rng());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_os_rng());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u64_std, u64, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u64_small, u64, SmallRng::from_thread_rng());
gen_uint!(gen_u64_os, u64, OsRng);
gen_uint!(gen_u64_os, u64, UnwrapErr(OsRng));
gen_uint!(gen_u64_thread, u64, thread_rng());

macro_rules! init_gen {
 ($fnn:ident, $gen:ident) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg32::from_entropy();
 let mut rng = Pcg32::from_os_rng();
 b.iter(|| {
 let r2 = $gen::from_rng(&mut rng).unwrap();
 let r2 = $gen::from_rng(&mut rng);
 r2
 });
 }
Expand All@@ -125,7 +126,7 @@ macro_rules! reseeding_bytes {
 ($fnn:ident, $thresh:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = ReseedingRng::new(ChaCha20Core::from_entropy(), $thresh * 1024, OsRng);
 let mut rng = ReseedingRng::new(ChaCha20Core::from_os_rng(), $thresh * 1024, OsRng);
 let mut buf = [0u8; RESEEDING_BYTES_LEN];
 b.iter(|| {
 for _ in 0..RESEEDING_BENCH_N {
Expand Down

28 changes: 14 additions & 14 deletions
benches/benches/misc.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use rand_pcg::{Pcg32, Pcg64Mcg};

#[bench]
fn misc_gen_bool_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -32,7 +32,7 @@ fn misc_gen_bool_const(b: &mut Bencher) {

#[bench]
fn misc_gen_bool_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -46,7 +46,7 @@ fn misc_gen_bool_var(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -58,7 +58,7 @@ fn misc_gen_ratio_const(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for i in 2..(RAND_BENCH_N as u32 + 2) {
Expand All@@ -70,7 +70,7 @@ fn misc_gen_ratio_var(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let d = Bernoulli::new(0.18).unwrap();
 let mut accum = true;
Expand All@@ -83,7 +83,7 @@ fn misc_bernoulli_const(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -99,7 +99,7 @@ fn misc_bernoulli_var(b: &mut Bencher) {
#[bench]
fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = iter::repeat(()).map(|()| rng.random()).take(512).collect();
 v
Expand All@@ -109,7 +109,7 @@ fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = Standard.sample_iter(&mut rng).take(512).collect();
 v
Expand All@@ -119,7 +119,7 @@ fn gen_1kb_u16_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u16; 32]; 16] = rng.random();
Expand All@@ -130,7 +130,7 @@ fn gen_1kb_u16_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u16; 512];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand All@@ -142,7 +142,7 @@ fn gen_1kb_u16_fill(b: &mut Bencher) {
#[bench]
fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = iter::repeat(()).map(|()| rng.random()).take(128).collect();
 v
Expand All@@ -152,7 +152,7 @@ fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
 v
Expand All@@ -162,7 +162,7 @@ fn gen_1kb_u64_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u64; 32]; 4] = rng.random();
Expand All@@ -173,7 +173,7 @@ fn gen_1kb_u64_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u64; 128];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add `TryRngCore` and `TryCryptoRng` traits by newpavlov · Pull Request #1424 · rust-random/rand · GitHub
Skip to content
Add TryRngCore and TryCryptoRng traits#1424

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

 Merged

dhardy
merged 5 commits into

from

May 8, 2024
 Merged


Add TryRngCore and TryCryptoRng traits
#1424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
515ad2c

Rework fallability


newpavlov May 7, 2024
6466cc8

Merge branch 'master' into try_traits


newpavlov May 7, 2024
cafe56f

fix benches


newpavlov May 7, 2024
9d5735b

Fix warnings in benches


newpavlov May 7, 2024
a28d242

Improve `rand_core` docs


newpavlov May 8, 2024

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
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,7 @@ compiler versions will be compatible. This is especially true of Rand's
experimental `simd_support` feature.

Rand supports limited functionality in `no_std` mode (enabled via
`default-features = false`). In this case, `OsRng` and `from_entropy` are
`default-features = false`). In this case, `OsRng` and `from_os_rng` are
unavailable (unless `getrandom` is enabled), large parts of `seq` are
unavailable (unless `alloc` is enabled), and `thread_rng` and `random` are
unavailable.
Expand Down

22 changes: 11 additions & 11 deletions
benches/benches/base_distributions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ macro_rules! distr_int {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -52,7 +52,7 @@ macro_rules! distr_nz_int {
 ($fnn:ident, $tynz:ty, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -72,7 +72,7 @@ macro_rules! distr_float {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -92,7 +92,7 @@ macro_rules! distr_duration {
 ($fnn:ident, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -114,7 +114,7 @@ macro_rules! distr {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand DownExpand Up@@ -191,15 +191,15 @@ macro_rules! gen_range_int {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen_range($low..high));
 // force recalculation of range each time
 high = high.wrapping_add(1) & core::$ty::MAX;
 high = high.wrapping_add(1) & $ty::MAX;
 }
 accum
 });
Expand DownExpand Up@@ -230,7 +230,7 @@ macro_rules! gen_range_float {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
Expand DownExpand Up@@ -267,7 +267,7 @@ macro_rules! uniform_sample {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -286,7 +286,7 @@ macro_rules! uniform_inclusive {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -306,7 +306,7 @@ macro_rules! uniform_single {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand Down

65 changes: 33 additions & 32 deletions
benches/benches/generators.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ const RAND_BENCH_N: u64 = 1000;
const BYTES_LEN: usize = 1024;

use core::mem::size_of;
use rand_chacha::rand_core::UnwrapErr;
use test::{black_box, Bencher};

use rand::prelude::*;
use rand::rngs::ReseedingRng;
use rand::rngs::{mock::StepRng, OsRng};
use rand_chacha::{ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Rng};
use rand_pcg::{Pcg32, Pcg64, Pcg64Mcg, Pcg64Dxsm};
use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};

macro_rules! gen_bytes {
 ($fnn:ident, $gen:expr) => {
Expand All@@ -41,17 +42,17 @@ macro_rules! gen_bytes {
}

gen_bytes!(gen_bytes_step, StepRng::new(0, 1));
gen_bytes!(gen_bytes_pcg32, Pcg32::from_entropy());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_entropy());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_entropy());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_entropy());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_entropy());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_entropy());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_entropy());
gen_bytes!(gen_bytes_std, StdRng::from_entropy());
gen_bytes!(gen_bytes_pcg32, Pcg32::from_os_rng());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_os_rng());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_os_rng());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_os_rng());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_os_rng());
gen_bytes!(gen_bytes_std, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_bytes!(gen_bytes_small, SmallRng::from_thread_rng());
gen_bytes!(gen_bytes_os, OsRng);
gen_bytes!(gen_bytes_os, UnwrapErr(OsRng));
gen_bytes!(gen_bytes_thread, thread_rng());

macro_rules! gen_uint {
Expand All@@ -62,7 +63,7 @@ macro_rules! gen_uint {
 b.iter(|| {
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen::<$ty>());
 accum = accum.wrapping_add(rng.random::<$ty>());
 }
 accum
 });
Expand All@@ -72,40 +73,40 @@ macro_rules! gen_uint {
}

gen_uint!(gen_u32_step, u32, StepRng::new(0, 1));
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_entropy());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_entropy());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_entropy());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_entropy());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_entropy());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_entropy());
gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_os_rng());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_os_rng());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u32_std, u32, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u32_small, u32, SmallRng::from_thread_rng());
gen_uint!(gen_u32_os, u32, OsRng);
gen_uint!(gen_u32_os, u32, UnwrapErr(OsRng));
gen_uint!(gen_u32_thread, u32, thread_rng());

gen_uint!(gen_u64_step, u64, StepRng::new(0, 1));
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_entropy());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_entropy());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_entropy());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_entropy());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_entropy());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_entropy());
gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_os_rng());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_os_rng());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u64_std, u64, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u64_small, u64, SmallRng::from_thread_rng());
gen_uint!(gen_u64_os, u64, OsRng);
gen_uint!(gen_u64_os, u64, UnwrapErr(OsRng));
gen_uint!(gen_u64_thread, u64, thread_rng());

macro_rules! init_gen {
 ($fnn:ident, $gen:ident) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg32::from_entropy();
 let mut rng = Pcg32::from_os_rng();
 b.iter(|| {
 let r2 = $gen::from_rng(&mut rng).unwrap();
 let r2 = $gen::from_rng(&mut rng);
 r2
 });
 }
Expand All@@ -125,7 +126,7 @@ macro_rules! reseeding_bytes {
 ($fnn:ident, $thresh:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = ReseedingRng::new(ChaCha20Core::from_entropy(), $thresh * 1024, OsRng);
 let mut rng = ReseedingRng::new(ChaCha20Core::from_os_rng(), $thresh * 1024, OsRng);
 let mut buf = [0u8; RESEEDING_BYTES_LEN];
 b.iter(|| {
 for _ in 0..RESEEDING_BENCH_N {
Expand Down

28 changes: 14 additions & 14 deletions
benches/benches/misc.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use rand_pcg::{Pcg32, Pcg64Mcg};

#[bench]
fn misc_gen_bool_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -32,7 +32,7 @@ fn misc_gen_bool_const(b: &mut Bencher) {

#[bench]
fn misc_gen_bool_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -46,7 +46,7 @@ fn misc_gen_bool_var(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -58,7 +58,7 @@ fn misc_gen_ratio_const(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for i in 2..(RAND_BENCH_N as u32 + 2) {
Expand All@@ -70,7 +70,7 @@ fn misc_gen_ratio_var(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let d = Bernoulli::new(0.18).unwrap();
 let mut accum = true;
Expand All@@ -83,7 +83,7 @@ fn misc_bernoulli_const(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -99,7 +99,7 @@ fn misc_bernoulli_var(b: &mut Bencher) {
#[bench]
fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = iter::repeat(()).map(|()| rng.random()).take(512).collect();
 v
Expand All@@ -109,7 +109,7 @@ fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = Standard.sample_iter(&mut rng).take(512).collect();
 v
Expand All@@ -119,7 +119,7 @@ fn gen_1kb_u16_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u16; 32]; 16] = rng.random();
Expand All@@ -130,7 +130,7 @@ fn gen_1kb_u16_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u16; 512];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand All@@ -142,7 +142,7 @@ fn gen_1kb_u16_fill(b: &mut Bencher) {
#[bench]
fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = iter::repeat(()).map(|()| rng.random()).take(128).collect();
 v
Expand All@@ -152,7 +152,7 @@ fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
 v
Expand All@@ -162,7 +162,7 @@ fn gen_1kb_u64_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u64; 32]; 4] = rng.random();
Expand All@@ -173,7 +173,7 @@ fn gen_1kb_u64_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u64; 128];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add `TryRngCore` and `TryCryptoRng` traits by newpavlov · Pull Request #1424 · rust-random/rand · GitHub
Skip to content
Add TryRngCore and TryCryptoRng traits#1424

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

 Merged

dhardy
merged 5 commits into

from

May 8, 2024
 Merged


Add TryRngCore and TryCryptoRng traits
#1424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
515ad2c

Rework fallability


newpavlov May 7, 2024
6466cc8

Merge branch 'master' into try_traits


newpavlov May 7, 2024
cafe56f

fix benches


newpavlov May 7, 2024
9d5735b

Fix warnings in benches


newpavlov May 7, 2024
a28d242

Improve `rand_core` docs


newpavlov May 8, 2024

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
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,7 @@ compiler versions will be compatible. This is especially true of Rand's
experimental `simd_support` feature.

Rand supports limited functionality in `no_std` mode (enabled via
`default-features = false`). In this case, `OsRng` and `from_entropy` are
`default-features = false`). In this case, `OsRng` and `from_os_rng` are
unavailable (unless `getrandom` is enabled), large parts of `seq` are
unavailable (unless `alloc` is enabled), and `thread_rng` and `random` are
unavailable.
Expand Down

22 changes: 11 additions & 11 deletions
benches/benches/base_distributions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ macro_rules! distr_int {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -52,7 +52,7 @@ macro_rules! distr_nz_int {
 ($fnn:ident, $tynz:ty, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -72,7 +72,7 @@ macro_rules! distr_float {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -92,7 +92,7 @@ macro_rules! distr_duration {
 ($fnn:ident, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -114,7 +114,7 @@ macro_rules! distr {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand DownExpand Up@@ -191,15 +191,15 @@ macro_rules! gen_range_int {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen_range($low..high));
 // force recalculation of range each time
 high = high.wrapping_add(1) & core::$ty::MAX;
 high = high.wrapping_add(1) & $ty::MAX;
 }
 accum
 });
Expand DownExpand Up@@ -230,7 +230,7 @@ macro_rules! gen_range_float {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
Expand DownExpand Up@@ -267,7 +267,7 @@ macro_rules! uniform_sample {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -286,7 +286,7 @@ macro_rules! uniform_inclusive {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -306,7 +306,7 @@ macro_rules! uniform_single {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand Down

65 changes: 33 additions & 32 deletions
benches/benches/generators.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ const RAND_BENCH_N: u64 = 1000;
const BYTES_LEN: usize = 1024;

use core::mem::size_of;
use rand_chacha::rand_core::UnwrapErr;
use test::{black_box, Bencher};

use rand::prelude::*;
use rand::rngs::ReseedingRng;
use rand::rngs::{mock::StepRng, OsRng};
use rand_chacha::{ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Rng};
use rand_pcg::{Pcg32, Pcg64, Pcg64Mcg, Pcg64Dxsm};
use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};

macro_rules! gen_bytes {
 ($fnn:ident, $gen:expr) => {
Expand All@@ -41,17 +42,17 @@ macro_rules! gen_bytes {
}

gen_bytes!(gen_bytes_step, StepRng::new(0, 1));
gen_bytes!(gen_bytes_pcg32, Pcg32::from_entropy());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_entropy());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_entropy());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_entropy());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_entropy());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_entropy());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_entropy());
gen_bytes!(gen_bytes_std, StdRng::from_entropy());
gen_bytes!(gen_bytes_pcg32, Pcg32::from_os_rng());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_os_rng());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_os_rng());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_os_rng());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_os_rng());
gen_bytes!(gen_bytes_std, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_bytes!(gen_bytes_small, SmallRng::from_thread_rng());
gen_bytes!(gen_bytes_os, OsRng);
gen_bytes!(gen_bytes_os, UnwrapErr(OsRng));
gen_bytes!(gen_bytes_thread, thread_rng());

macro_rules! gen_uint {
Expand All@@ -62,7 +63,7 @@ macro_rules! gen_uint {
 b.iter(|| {
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen::<$ty>());
 accum = accum.wrapping_add(rng.random::<$ty>());
 }
 accum
 });
Expand All@@ -72,40 +73,40 @@ macro_rules! gen_uint {
}

gen_uint!(gen_u32_step, u32, StepRng::new(0, 1));
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_entropy());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_entropy());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_entropy());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_entropy());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_entropy());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_entropy());
gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_os_rng());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_os_rng());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u32_std, u32, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u32_small, u32, SmallRng::from_thread_rng());
gen_uint!(gen_u32_os, u32, OsRng);
gen_uint!(gen_u32_os, u32, UnwrapErr(OsRng));
gen_uint!(gen_u32_thread, u32, thread_rng());

gen_uint!(gen_u64_step, u64, StepRng::new(0, 1));
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_entropy());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_entropy());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_entropy());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_entropy());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_entropy());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_entropy());
gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_os_rng());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_os_rng());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u64_std, u64, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u64_small, u64, SmallRng::from_thread_rng());
gen_uint!(gen_u64_os, u64, OsRng);
gen_uint!(gen_u64_os, u64, UnwrapErr(OsRng));
gen_uint!(gen_u64_thread, u64, thread_rng());

macro_rules! init_gen {
 ($fnn:ident, $gen:ident) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg32::from_entropy();
 let mut rng = Pcg32::from_os_rng();
 b.iter(|| {
 let r2 = $gen::from_rng(&mut rng).unwrap();
 let r2 = $gen::from_rng(&mut rng);
 r2
 });
 }
Expand All@@ -125,7 +126,7 @@ macro_rules! reseeding_bytes {
 ($fnn:ident, $thresh:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = ReseedingRng::new(ChaCha20Core::from_entropy(), $thresh * 1024, OsRng);
 let mut rng = ReseedingRng::new(ChaCha20Core::from_os_rng(), $thresh * 1024, OsRng);
 let mut buf = [0u8; RESEEDING_BYTES_LEN];
 b.iter(|| {
 for _ in 0..RESEEDING_BENCH_N {
Expand Down

28 changes: 14 additions & 14 deletions
benches/benches/misc.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use rand_pcg::{Pcg32, Pcg64Mcg};

#[bench]
fn misc_gen_bool_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -32,7 +32,7 @@ fn misc_gen_bool_const(b: &mut Bencher) {

#[bench]
fn misc_gen_bool_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -46,7 +46,7 @@ fn misc_gen_bool_var(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -58,7 +58,7 @@ fn misc_gen_ratio_const(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for i in 2..(RAND_BENCH_N as u32 + 2) {
Expand All@@ -70,7 +70,7 @@ fn misc_gen_ratio_var(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let d = Bernoulli::new(0.18).unwrap();
 let mut accum = true;
Expand All@@ -83,7 +83,7 @@ fn misc_bernoulli_const(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -99,7 +99,7 @@ fn misc_bernoulli_var(b: &mut Bencher) {
#[bench]
fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = iter::repeat(()).map(|()| rng.random()).take(512).collect();
 v
Expand All@@ -109,7 +109,7 @@ fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = Standard.sample_iter(&mut rng).take(512).collect();
 v
Expand All@@ -119,7 +119,7 @@ fn gen_1kb_u16_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u16; 32]; 16] = rng.random();
Expand All@@ -130,7 +130,7 @@ fn gen_1kb_u16_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u16; 512];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand All@@ -142,7 +142,7 @@ fn gen_1kb_u16_fill(b: &mut Bencher) {
#[bench]
fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = iter::repeat(()).map(|()| rng.random()).take(128).collect();
 v
Expand All@@ -152,7 +152,7 @@ fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
 v
Expand All@@ -162,7 +162,7 @@ fn gen_1kb_u64_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u64; 32]; 4] = rng.random();
Expand All@@ -173,7 +173,7 @@ fn gen_1kb_u64_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u64; 128];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add `TryRngCore` and `TryCryptoRng` traits by newpavlov · Pull Request #1424 · rust-random/rand · GitHub
Skip to content
Add TryRngCore and TryCryptoRng traits#1424

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

 Merged

dhardy
merged 5 commits into

from

May 8, 2024
 Merged


Add TryRngCore and TryCryptoRng traits
#1424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
515ad2c

Rework fallability


newpavlov May 7, 2024
6466cc8

Merge branch 'master' into try_traits


newpavlov May 7, 2024
cafe56f

fix benches


newpavlov May 7, 2024
9d5735b

Fix warnings in benches


newpavlov May 7, 2024
a28d242

Improve `rand_core` docs


newpavlov May 8, 2024

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
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,7 @@ compiler versions will be compatible. This is especially true of Rand's
experimental `simd_support` feature.

Rand supports limited functionality in `no_std` mode (enabled via
`default-features = false`). In this case, `OsRng` and `from_entropy` are
`default-features = false`). In this case, `OsRng` and `from_os_rng` are
unavailable (unless `getrandom` is enabled), large parts of `seq` are
unavailable (unless `alloc` is enabled), and `thread_rng` and `random` are
unavailable.
Expand Down

22 changes: 11 additions & 11 deletions
benches/benches/base_distributions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ macro_rules! distr_int {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -52,7 +52,7 @@ macro_rules! distr_nz_int {
 ($fnn:ident, $tynz:ty, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -72,7 +72,7 @@ macro_rules! distr_float {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -92,7 +92,7 @@ macro_rules! distr_duration {
 ($fnn:ident, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -114,7 +114,7 @@ macro_rules! distr {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand DownExpand Up@@ -191,15 +191,15 @@ macro_rules! gen_range_int {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen_range($low..high));
 // force recalculation of range each time
 high = high.wrapping_add(1) & core::$ty::MAX;
 high = high.wrapping_add(1) & $ty::MAX;
 }
 accum
 });
Expand DownExpand Up@@ -230,7 +230,7 @@ macro_rules! gen_range_float {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
Expand DownExpand Up@@ -267,7 +267,7 @@ macro_rules! uniform_sample {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -286,7 +286,7 @@ macro_rules! uniform_inclusive {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -306,7 +306,7 @@ macro_rules! uniform_single {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand Down

65 changes: 33 additions & 32 deletions
benches/benches/generators.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ const RAND_BENCH_N: u64 = 1000;
const BYTES_LEN: usize = 1024;

use core::mem::size_of;
use rand_chacha::rand_core::UnwrapErr;
use test::{black_box, Bencher};

use rand::prelude::*;
use rand::rngs::ReseedingRng;
use rand::rngs::{mock::StepRng, OsRng};
use rand_chacha::{ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Rng};
use rand_pcg::{Pcg32, Pcg64, Pcg64Mcg, Pcg64Dxsm};
use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};

macro_rules! gen_bytes {
 ($fnn:ident, $gen:expr) => {
Expand All@@ -41,17 +42,17 @@ macro_rules! gen_bytes {
}

gen_bytes!(gen_bytes_step, StepRng::new(0, 1));
gen_bytes!(gen_bytes_pcg32, Pcg32::from_entropy());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_entropy());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_entropy());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_entropy());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_entropy());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_entropy());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_entropy());
gen_bytes!(gen_bytes_std, StdRng::from_entropy());
gen_bytes!(gen_bytes_pcg32, Pcg32::from_os_rng());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_os_rng());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_os_rng());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_os_rng());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_os_rng());
gen_bytes!(gen_bytes_std, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_bytes!(gen_bytes_small, SmallRng::from_thread_rng());
gen_bytes!(gen_bytes_os, OsRng);
gen_bytes!(gen_bytes_os, UnwrapErr(OsRng));
gen_bytes!(gen_bytes_thread, thread_rng());

macro_rules! gen_uint {
Expand All@@ -62,7 +63,7 @@ macro_rules! gen_uint {
 b.iter(|| {
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen::<$ty>());
 accum = accum.wrapping_add(rng.random::<$ty>());
 }
 accum
 });
Expand All@@ -72,40 +73,40 @@ macro_rules! gen_uint {
}

gen_uint!(gen_u32_step, u32, StepRng::new(0, 1));
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_entropy());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_entropy());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_entropy());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_entropy());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_entropy());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_entropy());
gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_os_rng());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_os_rng());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u32_std, u32, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u32_small, u32, SmallRng::from_thread_rng());
gen_uint!(gen_u32_os, u32, OsRng);
gen_uint!(gen_u32_os, u32, UnwrapErr(OsRng));
gen_uint!(gen_u32_thread, u32, thread_rng());

gen_uint!(gen_u64_step, u64, StepRng::new(0, 1));
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_entropy());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_entropy());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_entropy());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_entropy());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_entropy());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_entropy());
gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_os_rng());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_os_rng());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u64_std, u64, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u64_small, u64, SmallRng::from_thread_rng());
gen_uint!(gen_u64_os, u64, OsRng);
gen_uint!(gen_u64_os, u64, UnwrapErr(OsRng));
gen_uint!(gen_u64_thread, u64, thread_rng());

macro_rules! init_gen {
 ($fnn:ident, $gen:ident) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg32::from_entropy();
 let mut rng = Pcg32::from_os_rng();
 b.iter(|| {
 let r2 = $gen::from_rng(&mut rng).unwrap();
 let r2 = $gen::from_rng(&mut rng);
 r2
 });
 }
Expand All@@ -125,7 +126,7 @@ macro_rules! reseeding_bytes {
 ($fnn:ident, $thresh:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = ReseedingRng::new(ChaCha20Core::from_entropy(), $thresh * 1024, OsRng);
 let mut rng = ReseedingRng::new(ChaCha20Core::from_os_rng(), $thresh * 1024, OsRng);
 let mut buf = [0u8; RESEEDING_BYTES_LEN];
 b.iter(|| {
 for _ in 0..RESEEDING_BENCH_N {
Expand Down

28 changes: 14 additions & 14 deletions
benches/benches/misc.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use rand_pcg::{Pcg32, Pcg64Mcg};

#[bench]
fn misc_gen_bool_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -32,7 +32,7 @@ fn misc_gen_bool_const(b: &mut Bencher) {

#[bench]
fn misc_gen_bool_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -46,7 +46,7 @@ fn misc_gen_bool_var(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -58,7 +58,7 @@ fn misc_gen_ratio_const(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for i in 2..(RAND_BENCH_N as u32 + 2) {
Expand All@@ -70,7 +70,7 @@ fn misc_gen_ratio_var(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let d = Bernoulli::new(0.18).unwrap();
 let mut accum = true;
Expand All@@ -83,7 +83,7 @@ fn misc_bernoulli_const(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -99,7 +99,7 @@ fn misc_bernoulli_var(b: &mut Bencher) {
#[bench]
fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = iter::repeat(()).map(|()| rng.random()).take(512).collect();
 v
Expand All@@ -109,7 +109,7 @@ fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = Standard.sample_iter(&mut rng).take(512).collect();
 v
Expand All@@ -119,7 +119,7 @@ fn gen_1kb_u16_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u16; 32]; 16] = rng.random();
Expand All@@ -130,7 +130,7 @@ fn gen_1kb_u16_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u16; 512];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand All@@ -142,7 +142,7 @@ fn gen_1kb_u16_fill(b: &mut Bencher) {
#[bench]
fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = iter::repeat(()).map(|()| rng.random()).take(128).collect();
 v
Expand All@@ -152,7 +152,7 @@ fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
 v
Expand All@@ -162,7 +162,7 @@ fn gen_1kb_u64_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u64; 32]; 4] = rng.random();
Expand All@@ -173,7 +173,7 @@ fn gen_1kb_u64_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u64; 128];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add `TryRngCore` and `TryCryptoRng` traits by newpavlov · Pull Request #1424 · rust-random/rand · GitHub
Skip to content
Add TryRngCore and TryCryptoRng traits#1424

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

 Merged

dhardy
merged 5 commits into

from

May 8, 2024
 Merged


Add TryRngCore and TryCryptoRng traits
#1424
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
515ad2c

Rework fallability


newpavlov May 7, 2024
6466cc8

Merge branch 'master' into try_traits


newpavlov May 7, 2024
cafe56f

fix benches


newpavlov May 7, 2024
9d5735b

Fix warnings in benches


newpavlov May 7, 2024
a28d242

Improve `rand_core` docs


newpavlov May 8, 2024

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
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,7 @@ compiler versions will be compatible. This is especially true of Rand's
experimental `simd_support` feature.

Rand supports limited functionality in `no_std` mode (enabled via
`default-features = false`). In this case, `OsRng` and `from_entropy` are
`default-features = false`). In this case, `OsRng` and `from_os_rng` are
unavailable (unless `getrandom` is enabled), large parts of `seq` are
unavailable (unless `alloc` is enabled), and `thread_rng` and `random` are
unavailable.
Expand Down

22 changes: 11 additions & 11 deletions
benches/benches/base_distributions.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,7 +32,7 @@ macro_rules! distr_int {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -52,7 +52,7 @@ macro_rules! distr_nz_int {
 ($fnn:ident, $tynz:ty, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -72,7 +72,7 @@ macro_rules! distr_float {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -92,7 +92,7 @@ macro_rules! distr_duration {
 ($fnn:ident, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand All@@ -114,7 +114,7 @@ macro_rules! distr {
 ($fnn:ident, $ty:ty, $distr:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let distr = $distr;

 b.iter(|| {
Expand DownExpand Up@@ -191,15 +191,15 @@ macro_rules! gen_range_int {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen_range($low..high));
 // force recalculation of range each time
 high = high.wrapping_add(1) & core::$ty::MAX;
 high = high.wrapping_add(1) & $ty::MAX;
 }
 accum
 });
Expand DownExpand Up@@ -230,7 +230,7 @@ macro_rules! gen_range_float {
 ($fnn:ident, $ty:ident, $low:expr, $high:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();

 b.iter(|| {
 let mut high = $high;
Expand DownExpand Up@@ -267,7 +267,7 @@ macro_rules! uniform_sample {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -286,7 +286,7 @@ macro_rules! uniform_inclusive {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand All@@ -306,7 +306,7 @@ macro_rules! uniform_single {
 ($fnn:ident, $type:ident, $low:expr, $high:expr, $count:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_entropy();
 let mut rng = Pcg64Mcg::from_os_rng();
 let low = black_box($low);
 let high = black_box($high);
 b.iter(|| {
Expand Down

65 changes: 33 additions & 32 deletions
benches/benches/generators.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,14 @@ const RAND_BENCH_N: u64 = 1000;
const BYTES_LEN: usize = 1024;

use core::mem::size_of;
use rand_chacha::rand_core::UnwrapErr;
use test::{black_box, Bencher};

use rand::prelude::*;
use rand::rngs::ReseedingRng;
use rand::rngs::{mock::StepRng, OsRng};
use rand_chacha::{ChaCha12Rng, ChaCha20Core, ChaCha20Rng, ChaCha8Rng};
use rand_pcg::{Pcg32, Pcg64, Pcg64Mcg, Pcg64Dxsm};
use rand_pcg::{Pcg32, Pcg64, Pcg64Dxsm, Pcg64Mcg};

macro_rules! gen_bytes {
 ($fnn:ident, $gen:expr) => {
Expand All@@ -41,17 +42,17 @@ macro_rules! gen_bytes {
}

gen_bytes!(gen_bytes_step, StepRng::new(0, 1));
gen_bytes!(gen_bytes_pcg32, Pcg32::from_entropy());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_entropy());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_entropy());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_entropy());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_entropy());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_entropy());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_entropy());
gen_bytes!(gen_bytes_std, StdRng::from_entropy());
gen_bytes!(gen_bytes_pcg32, Pcg32::from_os_rng());
gen_bytes!(gen_bytes_pcg64, Pcg64::from_os_rng());
gen_bytes!(gen_bytes_pcg64mcg, Pcg64Mcg::from_os_rng());
gen_bytes!(gen_bytes_pcg64dxsm, Pcg64Dxsm::from_os_rng());
gen_bytes!(gen_bytes_chacha8, ChaCha8Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha12, ChaCha12Rng::from_os_rng());
gen_bytes!(gen_bytes_chacha20, ChaCha20Rng::from_os_rng());
gen_bytes!(gen_bytes_std, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_bytes!(gen_bytes_small, SmallRng::from_thread_rng());
gen_bytes!(gen_bytes_os, OsRng);
gen_bytes!(gen_bytes_os, UnwrapErr(OsRng));
gen_bytes!(gen_bytes_thread, thread_rng());

macro_rules! gen_uint {
Expand All@@ -62,7 +63,7 @@ macro_rules! gen_uint {
 b.iter(|| {
 let mut accum: $ty = 0;
 for _ in 0..RAND_BENCH_N {
 accum = accum.wrapping_add(rng.gen::<$ty>());
 accum = accum.wrapping_add(rng.random::<$ty>());
 }
 accum
 });
Expand All@@ -72,40 +73,40 @@ macro_rules! gen_uint {
}

gen_uint!(gen_u32_step, u32, StepRng::new(0, 1));
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_entropy());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_entropy());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_entropy());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_entropy());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_entropy());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_entropy());
gen_uint!(gen_u32_std, u32, StdRng::from_entropy());
gen_uint!(gen_u32_pcg32, u32, Pcg32::from_os_rng());
gen_uint!(gen_u32_pcg64, u32, Pcg64::from_os_rng());
gen_uint!(gen_u32_pcg64mcg, u32, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u32_pcg64dxsm, u32, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u32_chacha8, u32, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u32_chacha12, u32, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u32_chacha20, u32, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u32_std, u32, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u32_small, u32, SmallRng::from_thread_rng());
gen_uint!(gen_u32_os, u32, OsRng);
gen_uint!(gen_u32_os, u32, UnwrapErr(OsRng));
gen_uint!(gen_u32_thread, u32, thread_rng());

gen_uint!(gen_u64_step, u64, StepRng::new(0, 1));
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_entropy());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_entropy());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_entropy());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_entropy());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_entropy());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_entropy());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_entropy());
gen_uint!(gen_u64_std, u64, StdRng::from_entropy());
gen_uint!(gen_u64_pcg32, u64, Pcg32::from_os_rng());
gen_uint!(gen_u64_pcg64, u64, Pcg64::from_os_rng());
gen_uint!(gen_u64_pcg64mcg, u64, Pcg64Mcg::from_os_rng());
gen_uint!(gen_u64_pcg64dxsm, u64, Pcg64Dxsm::from_os_rng());
gen_uint!(gen_u64_chacha8, u64, ChaCha8Rng::from_os_rng());
gen_uint!(gen_u64_chacha12, u64, ChaCha12Rng::from_os_rng());
gen_uint!(gen_u64_chacha20, u64, ChaCha20Rng::from_os_rng());
gen_uint!(gen_u64_std, u64, StdRng::from_os_rng());
#[cfg(feature = "small_rng")]
gen_uint!(gen_u64_small, u64, SmallRng::from_thread_rng());
gen_uint!(gen_u64_os, u64, OsRng);
gen_uint!(gen_u64_os, u64, UnwrapErr(OsRng));
gen_uint!(gen_u64_thread, u64, thread_rng());

macro_rules! init_gen {
 ($fnn:ident, $gen:ident) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = Pcg32::from_entropy();
 let mut rng = Pcg32::from_os_rng();
 b.iter(|| {
 let r2 = $gen::from_rng(&mut rng).unwrap();
 let r2 = $gen::from_rng(&mut rng);
 r2
 });
 }
Expand All@@ -125,7 +126,7 @@ macro_rules! reseeding_bytes {
 ($fnn:ident, $thresh:expr) => {
 #[bench]
 fn $fnn(b: &mut Bencher) {
 let mut rng = ReseedingRng::new(ChaCha20Core::from_entropy(), $thresh * 1024, OsRng);
 let mut rng = ReseedingRng::new(ChaCha20Core::from_os_rng(), $thresh * 1024, OsRng);
 let mut buf = [0u8; RESEEDING_BYTES_LEN];
 b.iter(|| {
 for _ in 0..RESEEDING_BENCH_N {
Expand Down

28 changes: 14 additions & 14 deletions
benches/benches/misc.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ use rand_pcg::{Pcg32, Pcg64Mcg};

#[bench]
fn misc_gen_bool_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -32,7 +32,7 @@ fn misc_gen_bool_const(b: &mut Bencher) {

#[bench]
fn misc_gen_bool_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -46,7 +46,7 @@ fn misc_gen_bool_var(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for _ in 0..RAND_BENCH_N {
Expand All@@ -58,7 +58,7 @@ fn misc_gen_ratio_const(b: &mut Bencher) {

#[bench]
fn misc_gen_ratio_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 for i in 2..(RAND_BENCH_N as u32 + 2) {
Expand All@@ -70,7 +70,7 @@ fn misc_gen_ratio_var(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_const(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let d = Bernoulli::new(0.18).unwrap();
 let mut accum = true;
Expand All@@ -83,7 +83,7 @@ fn misc_bernoulli_const(b: &mut Bencher) {

#[bench]
fn misc_bernoulli_var(b: &mut Bencher) {
 let mut rng = Pcg32::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg32::from_rng(&mut thread_rng());
 b.iter(|| {
 let mut accum = true;
 let mut p = 0.18;
Expand All@@ -99,7 +99,7 @@ fn misc_bernoulli_var(b: &mut Bencher) {
#[bench]
fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = iter::repeat(()).map(|()| rng.random()).take(512).collect();
 v
Expand All@@ -109,7 +109,7 @@ fn gen_1kb_u16_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u16> = Standard.sample_iter(&mut rng).take(512).collect();
 v
Expand All@@ -119,7 +119,7 @@ fn gen_1kb_u16_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u16; 32]; 16] = rng.random();
Expand All@@ -130,7 +130,7 @@ fn gen_1kb_u16_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u16_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u16; 512];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand All@@ -142,7 +142,7 @@ fn gen_1kb_u16_fill(b: &mut Bencher) {
#[bench]
fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {
 use core::iter;
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = iter::repeat(()).map(|()| rng.random()).take(128).collect();
 v
Expand All@@ -152,7 +152,7 @@ fn gen_1kb_u64_iter_repeat(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_sample_iter(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 let v: Vec<u64> = Standard.sample_iter(&mut rng).take(128).collect();
 v
Expand All@@ -162,7 +162,7 @@ fn gen_1kb_u64_sample_iter(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_gen_array(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 b.iter(|| {
 // max supported array length is 32!
 let v: [[u64; 32]; 4] = rng.random();
Expand All@@ -173,7 +173,7 @@ fn gen_1kb_u64_gen_array(b: &mut Bencher) {

#[bench]
fn gen_1kb_u64_fill(b: &mut Bencher) {
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng()).unwrap();
 let mut rng = Pcg64Mcg::from_rng(&mut thread_rng());
 let mut buf = [0u64; 128];
 b.iter(|| {
 rng.fill(&mut buf[..]);
Expand Down
Loading