From 81cf565e9312a54d8bf2d664b38eab1b7db35f25 Mon Sep 17 00:00:00 2001
From: Padraic Fanning <27117322+fanninpm@users.noreply.github.com>
Date: Sun, 3 May 2026 00:35:03 -0400
Subject: [PATCH 1/2] Add dependencies from `stdlib` crate to workspace

---
 Cargo.toml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 4e4092f3a5d..7c1af98229d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -172,24 +172,38 @@ ruff_source_file = { package = "rustpython-ruff_source_file", version = "0.15.8"
 
 der = { version = "0.8", features = ["alloc", "oid", "pem", "zeroize"] }
 phf = { version = "0.13.1", default-features = false, features = ["macros"]}
+adler32 = "1.2.0"
 ahash = "0.8.12"
 approx = "0.5.1"
 ascii = "1.1"
+aws-lc-rs = "1.16.3"
+base64 = "0.22"
+blake2 = "0.10.4"
 bitflags = "2.11.0"
 bitflagset = "0.0.3"
 bstr = "1"
+bzip2 = "0.6"
 chrono = { version = "0.4.44", default-features = false, features = ["clock", "oldtime", "std"] }
 constant_time_eq = "0.4"
 cranelift = "0.131.0"
 cranelift-jit = "0.131.0"
 cranelift-module = "0.131.0"
+crc32fast = "1.3.2"
 criterion = { version = "0.8", features = ["html_reports"] }
 crossbeam-utils = "0.8.21"
+csv-core = "0.1.11"
+digest = "0.10.7"
+dns-lookup = "3.0"
+dyn-clone = "1.0.10"
 flame = "0.2.2"
+flate2 = { version = "1.1.9", default-features = false }
+foreign-types-shared = "0.3.1"
+gethostname = "1.0.2"
 getrandom = { version = "0.3", features = ["std"] }
 glob = "0.3"
 hex = "0.4.3"
 hexf-parse = "0.2.1"
+hmac = "0.12"
 indexmap = { version = "2.14.0", features = ["std"] }
 insta = "1.47"
 itertools = "0.14.0"
@@ -198,20 +212,36 @@ junction = "1.4.2"
 lexical-parse-float = "1.0.6"
 libc = "0.2.186"
 libffi = "5"
+liblzma = "0.4"
+liblzma-sys = "0.4"
+libsqlite3-sys = "0.37"
+libz-sys = { package = "libz-rs-sys", version = "0.5" }
 log = "0.4.29"
 nix = { version = "0.31", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] }
+mac_address = "1.1.3"
 malachite-bigint = "0.9.1"
 malachite-q = "0.9.1"
 malachite-base = "0.9.1"
 maplit = "1.0.2"
+md-5 = "0.10.1"
 memchr = "2.8.0"
+memmap2 = "0.9.10"
+mt19937 = "<=3.2"  # upgrade it once rand is upgraded
 num-complex = "0.4.6"
 num-integer = "0.1.46"
 num-traits = "0.2"
 num_enum = { version = "0.7", default-features = false }
+oid-registry = "0.8"
+openssl = "0.10.78"
+openssl-sys = "0.9.110"
+openssl-probe = "0.2.1"
 optional = "0.5"
+page_size = "0.6"
 parking_lot = "0.12.3"
 paste = "1.0.15"
+pbkdf2 = "0.12"
+pem-rfc7468 = "1.0"
+pkcs8 = "0.10"
 proc-macro2 = "1.0.105"
 pymath = { version = "0.2.0", features = ["mul_add", "malachite-bigint", "complex"] }
 quote = "1.0.45"
@@ -219,27 +249,44 @@ radium = "1.1.1"
 rand = "0.9"
 rand_core = { version = "0.9", features = ["os_rng"] }
 rustix = { version = "1.1", features = ["event"] }
+rustls = { version = "0.23.39", default-features = false }
+rustls-native-certs = "0.8"
+rustls-pemfile = "2.2"
+rustls-platform-verifier = "0.7"
 rustyline = "18"
 serde = { package = "serde_core", version = "1.0.225", default-features = false, features = ["alloc"] }
 schannel = "0.1.29"
 scoped-tls = "1"
 scopeguard = "1"
+sha-1 = "0.10.0"
+sha2 = "0.10.2"
+sha3 = "0.10.1"
+socket2 = "0.6.3"
 static_assertions = "1.1"
 strum = "0.28"
 strum_macros = "0.28"
 syn = "2"
 syn-ext = "0.5.0"
+system-configuration = "0.7.0"
+tcl-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
 textwrap = { version = "0.16.2", default-features = false }
 termios = "0.3.3"
 thiserror = "2.0"
+tk-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
 icu_properties = "2"
 icu_normalizer = "2"
+uuid = "1.23.1"
+ucd = "0.1.1"
 unicode-casing = "0.1.1"
 unic-ucd-age = "0.9.0"
 unicode_names2 = "2.0.0"
 widestring = "1.2.0"
 windows-sys = "0.61.2"
 wasm-bindgen = "0.2.106"
+webpki-roots = "1.0"
+x509-cert = "0.2.5"
+x509-parser = "0.18"
+xml = "1.2"
 
 # Lints
 

From 8dea44261881a51418a8405fba6365e9ab585899 Mon Sep 17 00:00:00 2001
From: Padraic Fanning <27117322+fanninpm@users.noreply.github.com>
Date: Sun, 3 May 2026 00:35:35 -0400
Subject: [PATCH 2/2] Declare dependencies as workspace = true

---
 crates/stdlib/Cargo.toml | 98 ++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml
index e969114d164..8c8b183a718 100644
--- a/crates/stdlib/Cargo.toml
+++ b/crates/stdlib/Cargo.toml
@@ -51,28 +51,28 @@ malachite-bigint = { workspace = true }
 num-traits = { workspace = true }
 num_enum = { workspace = true }
 parking_lot = { workspace = true }
-phf = { version = "0.13", features = ["macros"] }
+phf = { workspace = true, default-features = true, features = ["macros"] }
 
 memchr = { workspace = true }
-base64 = "0.22"
-csv-core = "0.1.11"
-dyn-clone = "1.0.10"
+base64 = { workspace = true }
+csv-core = { workspace = true }
+dyn-clone = { workspace = true }
 pymath = { workspace = true }
-xml = "1.2"
+xml = { workspace = true }
 
 # random
 rand_core = { workspace = true }
-mt19937 = "<=3.2"  # upgrade it once rand is upgraded
+mt19937 = { workspace = true }
 
 # Crypto:
-digest = "0.10.7"
-md-5 = "0.10.1"
-sha-1 = "0.10.0"
-sha2 = "0.10.2"
-sha3 = "0.10.1"
-blake2 = "0.10.4"
-hmac = "0.12"
-pbkdf2 = { version = "0.12", features = ["hmac"] }
+digest = { workspace = true }
+md-5 = { workspace = true }
+sha-1 = { workspace = true }
+sha2 = { workspace = true }
+sha3 = { workspace = true }
+blake2 = { workspace = true }
+hmac = { workspace = true }
+pbkdf2 = { workspace = true, features = ["hmac"] }
 constant_time_eq = { workspace = true }
 
 ## unicode stuff
@@ -81,64 +81,64 @@ unicode_names2 = { workspace = true }
 icu_properties = { workspace = true }
 icu_normalizer = { workspace = true }
 unic-ucd-age       = { workspace = true }
-ucd = "0.1.1"
+ucd = { workspace = true }
 
 # compression
-adler32 = "1.2.0"
-crc32fast = "1.3.2"
-flate2 = { version = "1.1.9", default-features = false, features = ["zlib-rs"] }
-libz-sys = { package = "libz-rs-sys", version = "0.5" }
-bzip2 = "0.6"
+adler32 = { workspace = true }
+crc32fast = { workspace = true }
+flate2 = { workspace = true, features = ["zlib-rs"] }
+libz-sys = { package = "libz-rs-sys", workspace = true }
+bzip2 = { workspace = true }
 
 # tkinter
-tk-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0", optional = true }
-tcl-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0", optional = true }
+tk-sys = { workspace = true, optional = true }
+tcl-sys = { workspace = true, optional = true }
 widestring = { workspace = true, optional = true }
 chrono.workspace = 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.23.1", features = ["v1"] }
+mac_address = { workspace = true }
+uuid = { workspace = true, features = ["v1"] }
 
 [target.'cfg(all(unix, not(target_os = "redox"), not(target_os = "ios")))'.dependencies]
-termios = "0.3.3"
+termios = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 rustix = { workspace = true }
 
 # mmap + socket dependencies
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-memmap2 = "0.9.10"
-page_size = "0.6"
-gethostname = "1.0.2"
-socket2 = { version = "0.6.3", features = ["all"] }
-dns-lookup = "3.0"
+memmap2 = { workspace = true }
+page_size = { workspace = true }
+gethostname = { workspace = true }
+socket2 = { workspace = true, features = ["all"] }
+dns-lookup = { workspace = true }
 
 # OpenSSL dependencies (optional, for ssl-openssl feature)
-openssl = { version = "0.10.78", optional = true }
-openssl-sys = { version = "0.9.110", optional = true }
-openssl-probe = { version = "0.2.1", optional = true }
-foreign-types-shared = { version = "0.3.1", optional = true }
+openssl = { workspace = true, optional = true }
+openssl-sys = { workspace = true, optional = true }
+openssl-probe = { workspace = true, optional = true }
+foreign-types-shared = { workspace = true, optional = true }
 
 # Rustls dependencies (optional, for ssl-rustls feature)
-rustls = { version = "0.23.39", default-features = false, features = ["std", "tls12", "aws_lc_rs"], optional = true }
-rustls-native-certs = { version = "0.8", optional = true }
-rustls-pemfile = { version = "2.2", optional = true }
-rustls-platform-verifier = { version = "0.7", optional = true }
-x509-cert = { version = "0.2.5", features = ["pem", "builder"], optional = true }
-x509-parser = { version = "0.18", optional = true }
+rustls = { workspace = true, default-features = false, features = ["std", "tls12", "aws_lc_rs"], optional = true }
+rustls-native-certs = { workspace = true, optional = true }
+rustls-pemfile = { workspace = true, optional = true }
+rustls-platform-verifier = { workspace = true, optional = true }
+x509-cert = { workspace = true, features = ["pem", "builder"], optional = true }
+x509-parser = { workspace = true, optional = true }
 der = { workspace = true, optional = true }
-pem-rfc7468 = { version = "1.0", features = ["alloc"], optional = true }
-webpki-roots = { version = "1.0", optional = true }
-aws-lc-rs = { version = "1.16.3", optional = true }
-oid-registry = { version = "0.8", features = ["x509", "pkcs1", "nist_algs"], optional = true }
-pkcs8 = { version = "0.10", features = ["encryption", "pkcs5", "pem"], optional = true }
+pem-rfc7468 = { workspace = true, features = ["alloc"], optional = true }
+webpki-roots = { workspace = true, optional = true }
+aws-lc-rs = { workspace = true, optional = true }
+oid-registry = { workspace = true, features = ["x509", "pkcs1", "nist_algs"], optional = true }
+pkcs8 = { workspace = true, features = ["encryption", "pkcs5", "pem"], optional = true }
 
 [target.'cfg(not(any(target_os = "android", target_arch = "wasm32")))'.dependencies]
-libsqlite3-sys = { version = "0.37", features = ["bundled"], optional = true }
-liblzma = "0.4"
-liblzma-sys = "0.4"
+libsqlite3-sys = { workspace = true, features = ["bundled"], optional = true }
+liblzma = { workspace = true }
+liblzma-sys = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]
 paste = { workspace = true }
@@ -163,7 +163,7 @@ features = [
 ]
 
 [target.'cfg(target_os = "macos")'.dependencies]
-system-configuration = "0.7.0"
+system-configuration = { workspace = true }
 
 [lints]
 workspace = true