Add support for rand 0.9

Author: jhpratt

Cargo.lock

@@ -16,7 +16,8 @@ num_threads = "0.1.2"
 powerfmt = { version = "0.2.0", default-features = false }
 quickcheck = { version = "1.0.3", default-features = false }
 quickcheck_macros = "1.0.0"
-rand = { version = "0.8.4", default-features = false }
+rand08 = { package = "rand", version = "0.8.4", default-features = false }
+rand09 = { package = "rand", version = "0.9.2", default-features = false }
 rstest = { version = "0.23.0", default-features = false }
 rstest_reuse = "0.7.0"
 # ^1.0.184 due to serde-rs/serde#2538

Cargo.toml

@@ -100,7 +100,8 @@ mods![
     mod offset_date_time;
     mod parsing;
     mod primitive_date_time;
-    mod rand;
+    mod rand08;
+    mod rand09;
     mod time;
     mod utc_offset;
     mod util;

benchmarks/main.rs

@@ -1,6 +1,6 @@
 use criterion::Bencher;
-use rand::rngs::mock::StepRng;
-use rand::Rng;
+use rand08::rngs::mock::StepRng;
+use rand08::Rng;
 use time::{Date, Duration, Month, OffsetDateTime, PrimitiveDateTime, Time, UtcOffset, Weekday};
 
 macro_rules! bench_rand {

benchmarks/rand.rs renamed to benchmarks/rand08.rs

@@ -0,0 +1,61 @@
+use criterion::Bencher;
+use rand09::Rng;
+use time::{Date, Duration, Month, OffsetDateTime, PrimitiveDateTime, Time, UtcOffset, Weekday};
+
+macro_rules! bench_rand {
+    ($($name:ident : $type:ty),* $(,)?) => {
+        setup_benchmark! {
+            "Random",
+            $(fn $name(ben: &mut Bencher<'_>) {
+                iter_batched_ref!(
+                    ben,
+                    || StepRng::new(0, 1),
+                    [|rng| rng.random::<$type>()]
+                );
+            })*
+        }
+    }
+}
+
+bench_rand![
+    time: Time,
+    date: Date,
+    utc_offset: UtcOffset,
+    primitive_date_time: PrimitiveDateTime,
+    offset_date_time: OffsetDateTime,
+    duration: Duration,
+    weekday: Weekday,
+    month: Month,
+];
+
+// copy of `StepRng` from rand 0.8 to avoid deprecation warnings
+#[derive(Debug, Clone)]
+struct StepRng {
+    v: u64,
+    a: u64,
+}
+
+impl StepRng {
+    const fn new(initial: u64, increment: u64) -> Self {
+        Self {
+            v: initial,
+            a: increment,
+        }
+    }
+}
+
+impl rand09::RngCore for StepRng {
+    fn next_u32(&mut self) -> u32 {
+        self.next_u64() as u32
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        let res = self.v;
+        self.v = self.v.wrapping_add(self.a);
+        res
+    }
+
+    fn fill_bytes(&mut self, dst: &mut [u8]) {
+        rand09::rand_core::impls::fill_bytes_via_next(self, dst)
+    }
+}

benchmarks/rand09.rs

@@ -11,7 +11,8 @@ use std::panic::{RefUnwindSafe, UnwindSafe};
 use std::time::{Duration as StdDuration, Instant as StdInstant, SystemTime};
 
 use quickcheck::Arbitrary;
-use rand::distributions::{Distribution, Standard};
+use rand08::distributions::{Distribution as DistributionRand08, Standard as StandardRand08};
+use rand09::distr::{Distribution as DistributionRand09, StandardUniform as StandardUniformRand09};
 use serde::{Deserialize, Serialize};
 use time::format_description::well_known::iso8601;
 use time::format_description::{modifier, well_known, BorrowedFormatItem, Component};
@@ -1059,15 +1060,27 @@ assert_impl! { modifier::YearRepr:
     Unpin,
     UnwindSafe,
 }
-assert_impl! { Standard:
-    Distribution<Date>,
-    Distribution<Duration>,
-    Distribution<OffsetDateTime>,
-    Distribution<PrimitiveDateTime>,
-    Distribution<Time>,
-    Distribution<UtcOffset>,
-    Distribution<Month>,
-    Distribution<Weekday>,
+assert_impl! { StandardRand08:
+    DistributionRand08<Date>,
+    DistributionRand08<Duration>,
+    DistributionRand08<OffsetDateTime>,
+    DistributionRand08<UtcDateTime>,
+    DistributionRand08<PrimitiveDateTime>,
+    DistributionRand08<Time>,
+    DistributionRand08<UtcOffset>,
+    DistributionRand08<Month>,
+    DistributionRand08<Weekday>,
+}
+assert_impl! { StandardUniformRand09:
+    DistributionRand09<Date>,
+    DistributionRand09<Duration>,
+    DistributionRand09<OffsetDateTime>,
+    DistributionRand09<UtcDateTime>,
+    DistributionRand09<PrimitiveDateTime>,
+    DistributionRand09<Time>,
+    DistributionRand09<UtcOffset>,
+    DistributionRand09<Month>,
+    DistributionRand09<Weekday>,
 }
 assert_impl! { StdDuration:
     Add<Duration, Output = Duration>,

tests/meta.rs

@@ -1,10 +1,11 @@
-use rand::Rng;
+use rand08::Rng as _;
+use rand09::Rng as _;
 use time::{Date, Duration, Month, OffsetDateTime, PrimitiveDateTime, Time, UtcOffset, Weekday};
 
 #[test]
-fn support() {
+fn support08() {
     // Work around rust-random/rand#1020.
-    let mut rng = rand::rngs::mock::StepRng::new(0, 656_175_560);
+    let mut rng = rand08::rngs::mock::StepRng::new(0, 656_175_560);
 
     for _ in 0..7 {
         let _ = rng.r#gen::<Weekday>();
@@ -19,3 +20,54 @@ fn support() {
     let _ = rng.r#gen::<OffsetDateTime>();
     let _ = rng.r#gen::<Duration>();
 }
+
+#[test]
+fn support09() {
+    // Work around rust-random/rand#1020.
+    let mut rng = StepRng::new(0, 656_175_560);
+
+    for _ in 0..7 {
+        let _ = rng.random::<Weekday>();
+    }
+    for _ in 0..12 {
+        let _ = rng.random::<Month>();
+    }
+    let _ = rng.random::<Time>();
+    let _ = rng.random::<Date>();
+    let _ = rng.random::<UtcOffset>();
+    let _ = rng.random::<PrimitiveDateTime>();
+    let _ = rng.random::<OffsetDateTime>();
+    let _ = rng.random::<Duration>();
+}
+
+// copy of `StepRng` from rand 0.8 to avoid deprecation warnings
+#[derive(Debug, Clone)]
+struct StepRng {
+    v: u64,
+    a: u64,
+}
+
+impl StepRng {
+    fn new(initial: u64, increment: u64) -> Self {
+        Self {
+            v: initial,
+            a: increment,
+        }
+    }
+}
+
+impl rand09::RngCore for StepRng {
+    fn next_u32(&mut self) -> u32 {
+        self.next_u64() as u32
+    }
+
+    fn next_u64(&mut self) -> u64 {
+        let res = self.v;
+        self.v = self.v.wrapping_add(self.a);
+        res
+    }
+
+    fn fill_bytes(&mut self, dst: &mut [u8]) {
+        rand09::rand_core::impls::fill_bytes_via_next(self, dst)
+    }
+}

tests/rand.rs

@@ -38,7 +38,9 @@ local-offset = ["std", "dep:libc", "dep:num_threads"]
 macros = ["dep:time-macros"]
 parsing = ["time-macros?/parsing"]
 quickcheck = ["dep:quickcheck", "alloc", "deranged/quickcheck"]
-rand = ["dep:rand", "deranged/rand08"]
+rand = ["rand08", "rand09"]
+rand08 = ["dep:rand08", "deranged/rand08"]
+rand09 = ["dep:rand09", "deranged/rand09"]
 serde = ["dep:serde", "time-macros?/serde", "deranged/serde"]
 serde-human-readable = ["serde", "formatting", "parsing"]
 # Deprecated in favor of using the relevant flags directly.
@@ -53,7 +55,8 @@ deranged = { workspace = true }
 num-conv = { workspace = true }
 powerfmt = { workspace = true }
 quickcheck = { workspace = true, optional = true }
-rand = { workspace = true, optional = true }
+rand08 = { workspace = true, optional = true }
+rand09 = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 time-core = { workspace = true }
 time-macros = { workspace = true, optional = true }
@@ -67,7 +70,8 @@ js-sys = { workspace = true, optional = true }
 
 [dev-dependencies]
 num-conv = { workspace = true }
-rand = { workspace = true }
+rand08 = { workspace = true }
+rand09 = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 serde_test = { workspace = true }

time/Cargo.toml

@@ -41,28 +41,41 @@
 //!
 //! - `serde`
 //!
-//!   Enables [serde](https://docs.rs/serde) support for all types.
+//!   Enables [`serde`](https://docs.rs/serde) support for all types.
 //!
 //! - `serde-human-readable` (_implicitly enables `serde`, `formatting`, and `parsing`_)
 //!
-//!   Allows serde representations to use a human-readable format. This is determined by the
+//!   Allows `serde` representations to use a human-readable format. This is determined by the
 //!   serializer, not the user. If this feature is not enabled or if the serializer requests a
 //!   non-human-readable format, a format optimized for binary representation will be used.
 //!
 //!   Libraries should never enable this feature, as the decision of what format to use should be up
 //!   to the user.
 //!
-//! - `rand`
+//! - `rand` (_implicitly enables `rand08` and `rand09`_)
 //!
-//!   Enables [rand](https://docs.rs/rand) support for all types.
+//!   Previously, this would enable support for `rand` 0.8. Since the release of `rand` 0.9, the
+//!   feature has been split into `rand08` and `rand09` to allow support for both versions. For
+//!   backwards compatibility and simplicity, this feature enables support for _both_ series.
+//!
+//!   It is strongly recommended to enable `rand08` or `rand09` directly, as enabling `rand` will
+//!   needlessly pull in both versions.
+//!
+//! - `rand08`
+//!
+//!   Enables [`rand` 0.8](https://docs.rs/rand/0.8) support for all types.
+//!
+//! - `rand09`
+//!
+//!   Enables [`rand` 0.9](https://docs.rs/rand/0.9) support for all types.
 //!
 //! - `quickcheck` (_implicitly enables `alloc`_)
 //!
 //!   Enables [quickcheck](https://docs.rs/quickcheck) support for all types.
 //!
 //! - `wasm-bindgen`
 //!
-//!   Enables [wasm-bindgen](https://github.com/rustwasm/wasm-bindgen) support for converting
+//!   Enables [`wasm-bindgen`](https://github.com/rustwasm/wasm-bindgen) support for converting
 //!   [JavaScript dates](https://rustwasm.github.io/wasm-bindgen/api/js_sys/struct.Date.html), as
 //!   well as obtaining the UTC offset from JavaScript.
 
@@ -102,8 +115,10 @@ pub mod parsing;
 mod primitive_date_time;
 #[cfg(feature = "quickcheck")]
 mod quickcheck;
-#[cfg(feature = "rand")]
-mod rand;
+#[cfg(feature = "rand08")]
+mod rand08;
+#[cfg(feature = "rand09")]
+mod rand09;
 #[cfg(feature = "serde")]
 pub mod serde;
 mod sys;

time/src/lib.rs

@@ -1,7 +1,7 @@
 //! Implementation of [`Distribution`] for various structs.
 
-use rand::distributions::{Distribution, Standard};
-use rand::Rng;
+use rand08::distributions::{Distribution, Standard};
+use rand08::Rng;
 
 use crate::{
     Date, Duration, Month, OffsetDateTime, PrimitiveDateTime, Time, UtcDateTime, UtcOffset, Weekday,