From e42c385872e373a9bd0cf8c4992ac6ab54a8557a Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Wed, 11 Oct 2023 09:54:54 +0200 Subject: [PATCH] MSRV=1.60, use more permissive cfg on test * Use cfg(panic = unwind) instead of a check for wasm32 to see if unwinding is supported This allows the test to run on a future wasm target with exception support as well as running the test suite with panic=abort on non-wasm targets. * Bump MSRV to 1.60 --- .github/workflows/test.yml | 2 +- Cargo.toml | 2 +- README.md | 4 ++-- rand_chacha/Cargo.toml | 2 +- rand_chacha/README.md | 2 +- rand_core/Cargo.toml | 2 +- rand_core/README.md | 2 +- rand_distr/Cargo.toml | 2 +- rand_distr/README.md | 2 +- rand_distr/benches/Cargo.toml | 2 +- rand_pcg/Cargo.toml | 2 +- rand_pcg/README.md | 2 +- src/distributions/uniform.rs | 6 +----- 13 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bef0e3d513..4e20b0675c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,7 +47,7 @@ jobs: - os: ubuntu-latest target: x86_64-unknown-linux-gnu variant: MSRV - toolchain: 1.56.0 + toolchain: 1.60.0 - os: ubuntu-latest deps: sudo apt-get update ; sudo apt install gcc-multilib target: i686-unknown-linux-gnu diff --git a/Cargo.toml b/Cargo.toml index 8b783bb2ae..98dbdeb1dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["random", "rng"] categories = ["algorithms", "no-std"] autobenches = true edition = "2021" -rust-version = "1.56" +rust-version = "1.60" include = ["src/", "LICENSE-*", "README.md", "CHANGELOG.md", "COPYRIGHT"] [package.metadata.docs.rs] diff --git a/README.md b/README.md index c4704f3dc4..30c697922b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/) [![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand) [![API](https://docs.rs/rand/badge.svg)](https://docs.rs/rand) -[![Minimum rustc version](https://img.shields.io/badge/rustc-1.56+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) +[![Minimum rustc version](https://img.shields.io/badge/rustc-1.60+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) A Rust library for random number generation, featuring: @@ -97,7 +97,7 @@ issue tracker with the keyword `yank` *should* uncover the motivation. ### Rust version requirements -The Minimum Supported Rust Version (MSRV) is `rustc >= 1.56.0`. +The Minimum Supported Rust Version (MSRV) is `rustc >= 1.60.0`. Older releases may work (depending on feature configuration) but are untested. ## Crate Features diff --git a/rand_chacha/Cargo.toml b/rand_chacha/Cargo.toml index da22317304..847cfdde68 100644 --- a/rand_chacha/Cargo.toml +++ b/rand_chacha/Cargo.toml @@ -13,7 +13,7 @@ ChaCha random number generator keywords = ["random", "rng", "chacha"] categories = ["algorithms", "no-std"] edition = "2021" -rust-version = "1.56" +rust-version = "1.60" [package.metadata.docs.rs] rustdoc-args = ["--generate-link-to-definition"] diff --git a/rand_chacha/README.md b/rand_chacha/README.md index 851490e22a..0fd1b64c0d 100644 --- a/rand_chacha/README.md +++ b/rand_chacha/README.md @@ -5,7 +5,7 @@ [![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/) [![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_chacha) [![API](https://docs.rs/rand_chacha/badge.svg)](https://docs.rs/rand_chacha) -[![Minimum rustc version](https://img.shields.io/badge/rustc-1.56+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) +[![Minimum rustc version](https://img.shields.io/badge/rustc-1.60+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) A cryptographically secure random number generator that uses the ChaCha algorithm. diff --git a/rand_core/Cargo.toml b/rand_core/Cargo.toml index 7ad22fe7d9..6dd6f843a1 100644 --- a/rand_core/Cargo.toml +++ b/rand_core/Cargo.toml @@ -13,7 +13,7 @@ Core random number generator traits and tools for implementation. keywords = ["random", "rng"] categories = ["algorithms", "no-std"] edition = "2021" -rust-version = "1.56" +rust-version = "1.60" [package.metadata.docs.rs] # To build locally: diff --git a/rand_core/README.md b/rand_core/README.md index 4174ff1948..a08f7c9925 100644 --- a/rand_core/README.md +++ b/rand_core/README.md @@ -5,7 +5,7 @@ [![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/) [![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_core) [![API](https://docs.rs/rand_core/badge.svg)](https://docs.rs/rand_core) -[![Minimum rustc version](https://img.shields.io/badge/rustc-1.56+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) +[![Minimum rustc version](https://img.shields.io/badge/rustc-1.60+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) Core traits and error types of the [rand] library, plus tools for implementing RNGs. diff --git a/rand_distr/Cargo.toml b/rand_distr/Cargo.toml index ec4db034a6..a5907eb4fd 100644 --- a/rand_distr/Cargo.toml +++ b/rand_distr/Cargo.toml @@ -13,7 +13,7 @@ Sampling from random number distributions keywords = ["random", "rng", "distribution", "probability"] categories = ["algorithms", "no-std"] edition = "2021" -rust-version = "1.56" +rust-version = "1.60" include = ["src/", "LICENSE-*", "README.md", "CHANGELOG.md", "COPYRIGHT"] [package.metadata.docs.rs] diff --git a/rand_distr/README.md b/rand_distr/README.md index d11a3744c4..016e8981d8 100644 --- a/rand_distr/README.md +++ b/rand_distr/README.md @@ -5,7 +5,7 @@ [![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/) [![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_distr) [![API](https://docs.rs/rand_distr/badge.svg)](https://docs.rs/rand_distr) -[![Minimum rustc version](https://img.shields.io/badge/rustc-1.56+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) +[![Minimum rustc version](https://img.shields.io/badge/rustc-1.60+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) Implements a full suite of random number distribution sampling routines. diff --git a/rand_distr/benches/Cargo.toml b/rand_distr/benches/Cargo.toml index aeba667b3b..2dd82c7973 100644 --- a/rand_distr/benches/Cargo.toml +++ b/rand_distr/benches/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The Rand Project Developers"] license = "MIT OR Apache-2.0" description = "Criterion benchmarks of the rand_distr crate" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" publish = false [workspace] diff --git a/rand_pcg/Cargo.toml b/rand_pcg/Cargo.toml index c31b461adf..1d4e811a86 100644 --- a/rand_pcg/Cargo.toml +++ b/rand_pcg/Cargo.toml @@ -13,7 +13,7 @@ Selected PCG random number generators keywords = ["random", "rng", "pcg"] categories = ["algorithms", "no-std"] edition = "2021" -rust-version = "1.56" +rust-version = "1.60" [package.metadata.docs.rs] rustdoc-args = ["--generate-link-to-definition"] diff --git a/rand_pcg/README.md b/rand_pcg/README.md index ce6d1f37c6..da1a1beeff 100644 --- a/rand_pcg/README.md +++ b/rand_pcg/README.md @@ -5,7 +5,7 @@ [![Book](https://img.shields.io/badge/book-master-yellow.svg)](https://rust-random.github.io/book/) [![API](https://img.shields.io/badge/api-master-yellow.svg)](https://rust-random.github.io/rand/rand_pcg) [![API](https://docs.rs/rand_pcg/badge.svg)](https://docs.rs/rand_pcg) -[![Minimum rustc version](https://img.shields.io/badge/rustc-1.56+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) +[![Minimum rustc version](https://img.shields.io/badge/rustc-1.60+-lightgray.svg)](https://github.com/rust-random/rand#rust-version-requirements) Implements a selection of PCG random number generators. diff --git a/src/distributions/uniform.rs b/src/distributions/uniform.rs index c86c4970bf..ccf7b6e8ac 100644 --- a/src/distributions/uniform.rs +++ b/src/distributions/uniform.rs @@ -1536,11 +1536,7 @@ mod tests { } #[test] - #[cfg(all( - feature = "std", - not(target_arch = "wasm32"), - not(target_arch = "asmjs") - ))] + #[cfg(all(feature = "std", panic = "unwind"))] fn test_float_assertions() { use super::SampleUniform; use std::panic::catch_unwind;