Merge pull request #92 from nikessel/master

Updated to rand 0.9.0 and getrandom 0.3.1

Author: dylanhart

.github/workflows/ci-build.yml

@@ -22,3 +22,5 @@ jobs:
         run: cargo install wasm-pack
 
       - run: ~/.cargo/bin/wasm-pack test --node
+        env:
+          RUSTFLAGS: '--cfg getrandom_backend="wasm_js"'

Cargo.toml

@@ -19,7 +19,7 @@ postgres = ["dep:postgres-types", "dep:bytes"]
 
 [dependencies]
 serde = { version = "1.0", optional = true }
-rand = { version = "0.8", optional = true }
+rand = { version = "0.9", optional = true }
 uuid = { version = "1.1", optional = true }
 postgres-types = { version = "0.2.6", optional = true }
 bytes = { version = "1.4.0", optional = true }
@@ -32,7 +32,7 @@ bencher = "0.1"
 serde_derive = "1.0"
 
 [target.wasm32-unknown-unknown.dev-dependencies]
-getrandom = { version = "0.2", features = ["js"] }
+getrandom = { version = "0.3.1", features = ["wasm_js"] }
 wasm-bindgen-test = "0.3"
 
 [[bench]]

src/generator.rs

@@ -64,7 +64,7 @@ impl Generator {
     /// assert!(ulid1 < ulid2);
     /// ```
     pub fn generate_from_datetime(&mut self, datetime: SystemTime) -> Result<Ulid, MonotonicError> {
-        self.generate_from_datetime_with_source(datetime, &mut rand::thread_rng())
+        self.generate_from_datetime_with_source(datetime, &mut rand::rng())
     }
 
     /// Generate a new monotonic increasing Ulid with the given source
@@ -78,7 +78,7 @@ impl Generator {
     /// use std::time::SystemTime;
     /// use rand::prelude::*;
     ///
-    /// let mut rng = StdRng::from_entropy();
+    /// let mut rng = StdRng::from_os_rng();
     /// let mut gen = Generator::new();
     ///
     /// let ulid1 = gen.generate_with_source(&mut rng).unwrap();
@@ -104,7 +104,7 @@ impl Generator {
     /// use rand::prelude::*;
     ///
     /// let dt = SystemTime::now();
-    /// let mut rng = StdRng::from_entropy();
+    /// let mut rng = StdRng::from_os_rng();
     /// let mut gen = Generator::new();
     ///
     /// let ulid1 = gen.generate_from_datetime_with_source(dt, &mut rng).unwrap();

src/time.rs

@@ -23,7 +23,7 @@ impl Ulid {
     /// use rand::prelude::*;
     /// use ulid::Ulid;
     ///
-    /// let mut rng = StdRng::from_entropy();
+    /// let mut rng = StdRng::from_os_rng();
     /// let ulid = Ulid::with_source(&mut rng);
     /// ```
     pub fn with_source<R: rand::Rng>(source: &mut R) -> Ulid {
@@ -45,7 +45,7 @@ impl Ulid {
     /// let ulid = Ulid::from_datetime(SystemTime::now());
     /// ```
     pub fn from_datetime(datetime: SystemTime) -> Ulid {
-        Ulid::from_datetime_with_source(datetime, &mut rand::thread_rng())
+        Ulid::from_datetime_with_source(datetime, &mut rand::rng())
     }
 
     /// Creates a new Ulid with the given datetime and random number generator
@@ -59,7 +59,7 @@ impl Ulid {
     /// use rand::prelude::*;
     /// use ulid::Ulid;
     ///
-    /// let mut rng = StdRng::from_entropy();
+    /// let mut rng = StdRng::from_os_rng();
     /// let ulid = Ulid::from_datetime_with_source(SystemTime::now(), &mut rng);
     /// ```
     pub fn from_datetime_with_source<R>(datetime: SystemTime, source: &mut R) -> Ulid
@@ -72,8 +72,8 @@ impl Ulid {
             .as_millis();
         let timebits = (timestamp & bitmask!(Self::TIME_BITS)) as u64;
 
-        let msb = timebits << 16 | u64::from(source.gen::<u16>());
-        let lsb = source.gen::<u64>();
+        let msb = timebits << 16 | u64::from(source.random::<u16>());
+        let lsb = source.random::<u64>();
         Ulid::from((msb, lsb))
     }