Remove some unncessary dependencies

coolreader18 · youknowone · commit 24d995678f62 · 2025-03-31T11:28:15.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -158,7 +158,7 @@ chrono = "0.4.39"
 criterion = { version = "0.3.5", features = ["html_reports"] }
 crossbeam-utils = "0.8.21"
 flame = "0.2.2"
-getrandom = "0.3"
+getrandom = { version = "0.3", features = ["std"] }
 glob = "0.3"
 hex = "0.4.3"
 indexmap = { version = "2.2.6", features = ["std"] }
@@ -185,6 +185,7 @@ paste = "1.0.15"
 proc-macro2 = "1.0.93"
 quote = "1.0.38"
 rand = "0.9"
+rand_core = { version = "0.9", features = ["os_rng"] }
 rustix = { version = "0.38", features = ["event"] }
 rustyline = "15.0.0"
 serde = { version = "1.0.133", default-features = false }
diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -19,6 +19,7 @@ ascii = { workspace = true }
 bitflags = { workspace = true }
 bstr = { workspace = true }
 cfg-if = { workspace = true }
+getrandom = { workspace = true }
 itertools = { workspace = true }
 libc = { workspace = true }
 malachite-bigint = { workspace = true }
@@ -28,12 +29,11 @@ memchr = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
 parking_lot = { workspace = true, optional = true }
-rand = { workspace = true }
 unicode_names2 = { workspace = true }
 
 lock_api = "0.4"
 radium = "0.7"
-siphasher = "0.3"
+siphasher = "1"
 volatile = "0.3"
 
 [target.'cfg(windows)'.dependencies]
diff --git a/common/src/hash.rs b/common/src/hash.rs
@@ -37,15 +37,6 @@ impl BuildHasher for HashSecret {
     }
 }
 
-impl rand::distr::Distribution<HashSecret> for rand::distr::StandardUniform {
-    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> HashSecret {
-        HashSecret {
-            k0: rng.random(),
-            k1: rng.random(),
-        }
-    }
-}
-
 impl HashSecret {
     pub fn new(seed: u32) -> Self {
         let mut buf = [0u8; 16];
diff --git a/common/src/lib.rs b/common/src/lib.rs
@@ -23,6 +23,7 @@ pub mod int;
 pub mod linked_list;
 pub mod lock;
 pub mod os;
+pub mod rand;
 pub mod rc;
 pub mod refcount;
 pub mod static_cell;
diff --git a/common/src/rand.rs b/common/src/rand.rs
@@ -0,0 +1,13 @@
+/// Get `N` bytes of random data.
+///
+/// This function is mildly expensive to call, as it fetches random data
+/// directly from the OS entropy source.
+///
+/// # Panics
+///
+/// Panics if the OS entropy source returns an error.
+pub fn os_random<const N: usize>() -> [u8; N] {
+    let mut buf = [0u8; N];
+    getrandom::fill(&mut buf).unwrap();
+    buf
+}
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -19,5 +19,8 @@ ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
 thiserror = { workspace = true }
 
+[dev-dependencies]
+rand = { workspace = true }
+
 [lints]
 workspace = true
diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml
@@ -50,7 +50,7 @@ puruspe = "0.4.0"
 xml-rs = "0.8.14"
 
 # random
-rand = { workspace = true }
+rand_core = { workspace = true }
 mt19937 = "3.1"
 
 # Crypto:
diff --git a/stdlib/src/random.rs b/stdlib/src/random.rs
@@ -16,7 +16,7 @@ mod _random {
     use malachite_bigint::{BigInt, BigUint, Sign};
     use mt19937::MT19937;
     use num_traits::{Signed, Zero};
-    use rand::{RngCore, SeedableRng};
+    use rand_core::{RngCore, SeedableRng};
     use rustpython_vm::types::DefaultConstructor;
 
     #[pyattr]
diff --git a/stdlib/src/uuid.rs b/stdlib/src/uuid.rs
@@ -10,7 +10,8 @@ mod _uuid {
     fn get_node_id() -> [u8; 6] {
         match get_mac_address() {
             Ok(Some(_ma)) => get_mac_address().unwrap().unwrap().bytes(),
-            _ => rand::random::<[u8; 6]>(),
+            // os_random is expensive, but this is only ever called once
+            _ => rustpython_common::rand::os_random::<6>(),
         }
     }
 
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -68,7 +68,6 @@ num_enum = { workspace = true }
 once_cell = { workspace = true }
 parking_lot = { workspace = true }
 paste = { workspace = true }
-rand = { workspace = true }
 serde = { workspace = true, optional = true }
 static_assertions = { workspace = true }
 strum = { workspace = true }
@@ -160,7 +159,6 @@ getrandom = { workspace = true }
 [build-dependencies]
 glob = { workspace = true }
 itertools = { workspace = true }
-rustc_version = "0.4.0"
 
 [lints]
 workspace = true
diff --git a/vm/build.rs b/vm/build.rs
@@ -20,10 +20,7 @@ fn main() {
     );
     println!("cargo:rustc-env=RUSTPYTHON_GIT_TAG={}", git_tag());
     println!("cargo:rustc-env=RUSTPYTHON_GIT_BRANCH={}", git_branch());
-    println!(
-        "cargo:rustc-env=RUSTC_VERSION={}",
-        rustc_version::version().unwrap()
-    );
+    println!("cargo:rustc-env=RUSTC_VERSION={}", rustc_version());
 
     println!(
         "cargo:rustc-env=RUSTPYTHON_TARGET_TRIPLE={}",
@@ -61,7 +58,12 @@ fn git(args: &[&str]) -> String {
     command("git", args)
 }
 
-fn command(cmd: &str, args: &[&str]) -> String {
+fn rustc_version() -> String {
+    let rustc = env::var_os("RUSTC").unwrap_or_else(|| "rustc".into());
+    command(rustc, &["-V"])
+}
+
+fn command(cmd: impl AsRef<std::ffi::OsStr>, args: &[&str]) -> String {
     match Command::new(cmd).args(args).output() {
         Ok(output) => match String::from_utf8(output.stdout) {
             Ok(s) => s,
diff --git a/vm/src/import.rs b/vm/src/import.rs
@@ -49,7 +49,8 @@ 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::random::<[u8; 4]>().to_vec();
+            // os_random is expensive, but this is only ever called once
+            magic = rustpython_common::rand::os_random::<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/version.rs b/vm/src/version.rs
@@ -21,7 +21,7 @@ pub fn get_version() -> String {
         get_version_number(),
         get_build_info(),
         env!("CARGO_PKG_VERSION"),
-        get_compiler()
+        COMPILER,
     )
 }
 
@@ -33,9 +33,7 @@ pub fn get_winver_number() -> String {
     format!("{MAJOR}.{MINOR}")
 }
 
-pub fn get_compiler() -> String {
-    format!("rustc {}", env!("RUSTC_VERSION"))
-}
+const COMPILER: &str = env!("RUSTC_VERSION");
 
 pub fn get_build_info() -> String {
     // See: https://reproducible-builds.org/docs/timestamps/
diff --git a/vm/src/vm/mod.rs b/vm/src/vm/mod.rs
@@ -109,7 +109,8 @@ pub struct PyGlobalState {
 pub fn process_hash_secret_seed() -> u32 {
     use std::sync::OnceLock;
     static SEED: OnceLock<u32> = OnceLock::new();
-    *SEED.get_or_init(rand::random)
+    // os_random is expensive, but this is only ever called once
+    *SEED.get_or_init(|| u32::from_ne_bytes(rustpython_common::rand::os_random()))
 }
 
 impl VirtualMachine {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ mod _uuid {`
`10`	`10`	`fn get_node_id() -> [u8; 6] {`
`11`	`11`	`match get_mac_address() {`
`12`	`12`	`Ok(Some(_ma)) => get_mac_address().unwrap().unwrap().bytes(),`
`13`		`- _ => rand::random::<[u8; 6]>(),`
	`13`	`+ // os_random is expensive, but this is only ever called once`
	`14`	`+ _ => rustpython_common::rand::os_random::<6>(),`
`14`	`15`	`}`
`15`	`16`	`}`
`16`	`17`