1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
Description: use older minor version of crates rand and getrandom
This essentially reverts upstream git commit 17625a7.
Author: Jonas Smedegaard <dr@jones.dk>
Forwarded: not-needed
Last-Update: 2025-08-28
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@
[dependencies]
serde = { version = "1.0", optional = true }
-rand = { version = "0.9", optional = true }
+rand = { version = "0.8", optional = true }
uuid = { version = "1.1", optional = true }
postgres-types = { version = "0.2.6", optional = true }
bytes = { version = "1.4.0", optional = true }
@@ -34,7 +34,7 @@
serde_derive = "1.0"
[target.wasm32-unknown-unknown.dev-dependencies]
-getrandom = { version = "0.3.1", features = ["wasm_js"] }
+getrandom = { version = "0.2", features = ["js"] }
wasm-bindgen-test = "0.3"
[[bench]]
--- a/src/generator.rs
+++ b/src/generator.rs
@@ -64,7 +64,7 @@
/// assert!(ulid1 < ulid2);
/// ```
pub fn generate_from_datetime(&mut self, datetime: SystemTime) -> Result<Ulid, MonotonicError> {
- self.generate_from_datetime_with_source(datetime, &mut rand::rng())
+ self.generate_from_datetime_with_source(datetime, &mut rand::thread_rng())
}
/// Generate a new monotonic increasing Ulid with the given source
@@ -78,7 +78,7 @@
/// use std::time::SystemTime;
/// use rand::prelude::*;
///
- /// let mut rng = StdRng::from_os_rng();
+ /// let mut rng = StdRng::from_entropy();
/// let mut gen = Generator::new();
///
/// let ulid1 = gen.generate_with_source(&mut rng).unwrap();
@@ -104,7 +104,7 @@
/// use rand::prelude::*;
///
/// let dt = SystemTime::now();
- /// let mut rng = StdRng::from_os_rng();
+ /// let mut rng = StdRng::from_entropy();
/// let mut gen = Generator::new();
///
/// let ulid1 = gen.generate_from_datetime_with_source(dt, &mut rng).unwrap();
--- a/src/time.rs
+++ b/src/time.rs
@@ -23,7 +23,7 @@
/// use rand::prelude::*;
/// use ulid::Ulid;
///
- /// let mut rng = StdRng::from_os_rng();
+ /// let mut rng = StdRng::from_entropy();
/// let ulid = Ulid::with_source(&mut rng);
/// ```
pub fn with_source<R: rand::Rng>(source: &mut R) -> Ulid {
@@ -45,7 +45,7 @@
/// let ulid = Ulid::from_datetime(SystemTime::now());
/// ```
pub fn from_datetime(datetime: SystemTime) -> Ulid {
- Ulid::from_datetime_with_source(datetime, &mut rand::rng())
+ Ulid::from_datetime_with_source(datetime, &mut rand::thread_rng())
}
/// Creates a new Ulid with the given datetime and random number generator
@@ -59,7 +59,7 @@
/// use rand::prelude::*;
/// use ulid::Ulid;
///
- /// let mut rng = StdRng::from_os_rng();
+ /// let mut rng = StdRng::from_entropy();
/// 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 @@
.as_millis();
let timebits = (timestamp & bitmask!(Self::TIME_BITS)) as u64;
- let msb = timebits << 16 | u64::from(source.random::<u16>());
- let lsb = source.random::<u64>();
+ let msb = timebits << 16 | u64::from(source.gen::<u16>());
+ let lsb = source.gen::<u64>();
Ulid::from((msb, lsb))
}
|
