Update rand to 0.9

coolreader18 · youknowone · commit fa2acd7cde46 · 2025-02-18T17:07:26.000+09:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -379,7 +379,8 @@ jobs:
         with: { wabt-version: "1.0.30" }
       - name: check wasm32-unknown without js
         run: |
-          cargo build --release --manifest-path wasm/wasm-unknown-test/Cargo.toml --target wasm32-unknown-unknown --verbose
+          cd wasm/wasm-unknown-test
+          cargo build --release --verbose
           if wasm-objdump -xj Import target/wasm32-unknown-unknown/release/wasm_unknown_test.wasm; then
             echo "ERROR: wasm32-unknown module expects imports from the host environment" >2
           fi
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -146,7 +146,7 @@ cfg-if = "1.0"
 chrono = "0.4.39"
 crossbeam-utils = "0.8.21"
 flame = "0.2.2"
-getrandom = "0.2.15"
+getrandom = "0.3"
 glob = "0.3"
 hex = "0.4.3"
 indexmap = { version = "2.2.6", features = ["std"] }
@@ -168,7 +168,7 @@ num_enum = { version = "0.7", default-features = false }
 once_cell = "1.20.3"
 parking_lot = "0.12.3"
 paste = "1.0.15"
-rand = "0.8.5"
+rand = "0.9"
 rustix = { version = "0.38", features = ["event"] }
 rustyline = "15.0.0"
 serde = { version = "1.0.133", default-features = false }
diff --git a/common/src/hash.rs b/common/src/hash.rs
@@ -37,11 +37,11 @@ impl BuildHasher for HashSecret {
     }
 }
 
-impl rand::distributions::Distribution<HashSecret> for rand::distributions::Standard {
+impl rand::distr::Distribution<HashSecret> for rand::distr::StandardUniform {
     fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> HashSecret {
         HashSecret {
-            k0: rng.gen(),
-            k1: rng.gen(),
+            k0: rng.random(),
+            k1: rng.random(),
         }
     }
 }
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -54,8 +54,7 @@ xml-rs = "0.8.14"
 
 # random
 rand = { workspace = true }
-rand_core = "0.6.4"
-mt19937 = "2.0.1"
+mt19937 = "3.1"
 
 # Crypto:
 digest = "0.10.3"
@@ -88,7 +87,7 @@ bzip2 = { version = "0.4", optional = true }
 # uuid
 [target.'cfg(not(any(target_os = "ios", target_os = "android", target_os = "windows", target_arch = "wasm32", target_os = "redox")))'.dependencies]
 mac_address = "1.1.3"
-uuid = { version = "1.1.2", features = ["v1", "fast-rng"] }
+uuid = { version = "1.1.2", features = ["v1"] }
 
 # mmap
 [target.'cfg(all(unix, not(target_arch = "wasm32")))'.dependencies]
diff --git a/stdlib/src/random.rs b/stdlib/src/random.rs
@@ -23,7 +23,7 @@ mod _random {
 
     impl Default for PyRng {
         fn default() -> Self {
-            PyRng::Std(Box::new(StdRng::from_entropy()))
+            PyRng::Std(Box::new(StdRng::from_os_rng()))
         }
     }
 
@@ -46,12 +46,6 @@ mod _random {
                 Self::MT(m) => m.fill_bytes(dest),
             }
         }
-        fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand::Error> {
-            match self {
-                Self::Std(s) => s.try_fill_bytes(dest),
-                Self::MT(m) => m.try_fill_bytes(dest),
-            }
-        }
     }
 
     #[pyattr]
diff --git a/stdlib/src/uuid.rs b/stdlib/src/uuid.rs
@@ -5,33 +5,19 @@ mod _uuid {
     use crate::{builtins::PyNone, vm::VirtualMachine};
     use mac_address::get_mac_address;
     use once_cell::sync::OnceCell;
-    use rand::Rng;
-    use std::time::{Duration, SystemTime};
-    use uuid::{
-        v1::{Context, Timestamp},
-        Uuid,
-    };
+    use uuid::{timestamp::Timestamp, Context, Uuid};
 
     fn get_node_id() -> [u8; 6] {
         match get_mac_address() {
             Ok(Some(_ma)) => get_mac_address().unwrap().unwrap().bytes(),
-            _ => rand::thread_rng().gen::<[u8; 6]>(),
+            _ => rand::random::<[u8; 6]>(),
         }
     }
 
-    pub fn now_unix_duration() -> Duration {
-        use std::time::UNIX_EPOCH;
-
-        let now = SystemTime::now();
-        now.duration_since(UNIX_EPOCH)
-            .expect("SystemTime before UNIX EPOCH!")
-    }
-
     #[pyfunction]
     fn generate_time_safe() -> (Vec<u8>, PyNone) {
         static CONTEXT: Context = Context::new(0);
-        let now = now_unix_duration();
-        let ts = Timestamp::from_unix(&CONTEXT, now.as_secs(), now.subsec_nanos());
+        let ts = Timestamp::now(&CONTEXT);
 
         static NODE_ID: OnceCell<[u8; 6]> = OnceCell::new();
         let unique_node_id = NODE_ID.get_or_init(get_node_id);
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -23,7 +23,7 @@ ast = ["rustpython-ast"]
 codegen = ["rustpython-codegen", "ast"]
 parser = ["rustpython-parser", "ast"]
 serde = ["dep:serde"]
-wasmbind = ["chrono/wasmbind", "getrandom/js", "wasm-bindgen"]
+wasmbind = ["chrono/wasmbind", "getrandom/wasm_js", "wasm-bindgen"]
 
 [dependencies]
 rustpython-compiler = { workspace = true, optional = true }
@@ -145,7 +145,7 @@ features = [
 
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
 wasm-bindgen = { workspace = true, optional = true }
-getrandom = { workspace = true, features = ["custom"] }
+getrandom = { workspace = true }
 
 [build-dependencies]
 glob = { workspace = true }
diff --git a/vm/src/import.rs b/vm/src/import.rs
@@ -8,7 +8,6 @@ use crate::{
     vm::{thread, VirtualMachine},
     AsObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject,
 };
-use rand::Rng;
 
 pub(crate) fn init_importlib_base(vm: &mut VirtualMachine) -> PyResult<PyObjectRef> {
     flame_guard!("init importlib");
@@ -50,7 +49,7 @@ pub(crate) fn init_importlib_package(vm: &VirtualMachine, importlib: PyObjectRef
         let mut magic = get_git_revision().into_bytes();
         magic.truncate(4);
         if magic.len() != 4 {
-            magic = rand::thread_rng().gen::<[u8; 4]>().to_vec();
+            magic = rand::random::<[u8; 4]>().to_vec();
         }
         let magic: PyObjectRef = vm.ctx.new_bytes(magic).into();
         importlib_external.set_attr("MAGIC_NUMBER", magic, vm)?;
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -978,7 +978,7 @@ pub(super) mod _os {
             return Err(vm.new_value_error("negative argument not allowed".to_owned()));
         }
         let mut buf = vec![0u8; size as usize];
-        getrandom::getrandom(&mut buf).map_err(|e| match e.raw_os_error() {
+        getrandom::fill(&mut buf).map_err(|e| match e.raw_os_error() {
             Some(errno) => io::Error::from_raw_os_error(errno).into_pyexception(vm),
             None => vm.new_os_error("Getting random failed".to_owned()),
         })?;
diff --git a/wasm/lib/.cargo/config.toml b/wasm/lib/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "wasm32-unknown-unknown"
+
+[target.wasm32-unknown-unknown]
+rustflags = ["--cfg=getrandom_backend=\"wasm_js\""]
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -28,6 +28,9 @@ rustpython-parser = { workspace = true }
 serde = { workspace = true }
 wasm-bindgen = { workspace = true }
 
+# remove once getrandom 0.2 is no longer otherwise in the dependency tree
+getrandom = { version = "0.2", features = ["js"] }
+
 console_error_panic_hook = "0.1"
 js-sys = "0.3"
 serde-wasm-bindgen = "0.3.1"
@@ -47,4 +50,4 @@ web-sys = { version = "0.3", features = [
 wasm-opt = false#["-O1"]
 
 [lints]
-workspace = true
+workspace = true
diff --git a/wasm/wasm-unknown-test/.cargo/config.toml b/wasm/wasm-unknown-test/.cargo/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "wasm32-unknown-unknown"
+
+[target.wasm32-unknown-unknown]
+rustflags = ["--cfg=getrandom_backend=\"custom\""]
diff --git a/wasm/wasm-unknown-test/Cargo.toml b/wasm/wasm-unknown-test/Cargo.toml
@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 getrandom = { version = "0.2.12", features = ["custom"] }
+getrandom_03 = { package = "getrandom", version = "0.3" }
 rustpython-vm = { path = "../../vm", default-features = false, features = ["compiler"] }
 
 [workspace]
diff --git a/wasm/wasm-unknown-test/src/lib.rs b/wasm/wasm-unknown-test/src/lib.rs
@@ -14,3 +14,11 @@ fn getrandom_always_fail(_buf: &mut [u8]) -> Result<(), getrandom::Error> {
 }
 
 getrandom::register_custom_getrandom!(getrandom_always_fail);
+
+#[unsafe(no_mangle)]
+unsafe extern "Rust" fn __getrandom_v03_custom(
+    _dest: *mut u8,
+    _len: usize,
+) -> Result<(), getrandom_03::Error> {
+    Err(getrandom_03::Error::UNSUPPORTED)
+}

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,11 @@ impl BuildHasher for HashSecret {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-impl rand::distributions::Distribution<HashSecret> for rand::distributions::Standard {`
	`40`	`+impl rand::distr::Distribution<HashSecret> for rand::distr::StandardUniform {`
`41`	`41`	`fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> HashSecret {`
`42`	`42`	`HashSecret {`
`43`		`- k0: rng.gen(),`
`44`		`- k1: rng.gen(),`
	`43`	`+ k0: rng.random(),`
	`44`	`+ k1: rng.random(),`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ mod _random {`
`23`	`23`
`24`	`24`	`impl Default for PyRng {`
`25`	`25`	`fn default() -> Self {`
`26`		`- PyRng::Std(Box::new(StdRng::from_entropy()))`
	`26`	`+ PyRng::Std(Box::new(StdRng::from_os_rng()))`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -46,12 +46,6 @@ mod _random {`
`46`	`46`	`Self::MT(m) => m.fill_bytes(dest),`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`- fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand::Error> {`
`50`		`- match self {`
`51`		`- Self::Std(s) => s.try_fill_bytes(dest),`
`52`		`- Self::MT(m) => m.try_fill_bytes(dest),`
`53`		`- }`
`54`		`- }`
`55`	`49`	`}`
`56`	`50`
`57`	`51`	`#[pyattr]`
Original file line number	Diff line number	Diff line change
`@@ -978,7 +978,7 @@ pub(super) mod _os {`
`978`	`978`	`return Err(vm.new_value_error("negative argument not allowed".to_owned()));`
`979`	`979`	`}`
`980`	`980`	`let mut buf = vec![0u8; size as usize];`
`981`		`- getrandom::getrandom(&mut buf).map_err(\|e\| match e.raw_os_error() {`
	`981`	`+ getrandom::fill(&mut buf).map_err(\|e\| match e.raw_os_error() {`
`982`	`982`	`Some(errno) => io::Error::from_raw_os_error(errno).into_pyexception(vm),`
`983`	`983`	`None => vm.new_os_error("Getting random failed".to_owned()),`
`984`	`984`	`})?;`