Use correct dirs crate; drop uname for rustix (RustPython#7906)

joshuamegnauth54 · web-flow · commit e16f1aa65745 · 2026-05-19T13:27:32.000+09:00
RustPython used an ancient, unmaintained version of the `dirs` crate.
This pulled in `winapi-rs` on Windows, which is an old crate that has
been deprecated in favor of `windows-rs`. `windows-rs` is maintained by
Microsoft. Bumping `dirs` to the latest version removes more `winapi-rs`
from Cargo.lock.

As for `uname`, `rustix` handles it safely so the additional crate isn't
needed.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,7 +42,7 @@ log = { workspace = true }
 flame = { workspace = true, optional = true }
 
 lexopt = "0.3"
-dirs = { package = "dirs-next", version = "2.0" }
+dirs = "6"
 env_logger = "0.11"
 flamescope = { version = "0.1.2", optional = true }
 
diff --git a/crates/host_env/Cargo.toml b/crates/host_env/Cargo.toml
@@ -20,7 +20,6 @@ paste = { workspace = true }
 [target.'cfg(unix)'.dependencies]
 nix = { workspace = true }
 rustix = { workspace = true }
-uname = "0.1.1"
 
 [target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies]
 num_cpus = "1.17.0"
diff --git a/crates/host_env/src/posix.rs b/crates/host_env/src/posix.rs
@@ -380,14 +380,14 @@ pub fn fchownat(
     .map_err(std::io::Error::from)
 }
 
-pub fn uname_info() -> std::io::Result<UnameInfo> {
-    let info = uname::uname()?;
+pub fn uname_info() -> Result<UnameInfo, core::str::Utf8Error> {
+    let info = rustix::system::uname();
     Ok(UnameInfo {
-        sysname: info.sysname,
-        nodename: info.nodename,
-        release: info.release,
-        version: info.version,
-        machine: info.machine,
+        sysname: info.sysname().to_str()?.into(),
+        nodename: info.nodename().to_str()?.into(),
+        release: info.release().to_str()?.into(),
+        version: info.version().to_str()?.into(),
+        machine: info.machine().to_str()?.into(),
     })
 }
 
diff --git a/crates/vm/src/stdlib/posix.rs b/crates/vm/src/stdlib/posix.rs
@@ -1279,8 +1279,8 @@ pub mod module {
 
     #[pyfunction]
     fn uname(vm: &VirtualMachine) -> PyResult<_os::UnameResultData> {
-        let info =
-            rustpython_host_env::posix::uname_info().map_err(|err| err.into_pyexception(vm))?;
+        let info = rustpython_host_env::posix::uname_info()
+            .map_err(|err| vm.new_unicode_decode_error(err.to_string()))?;
         Ok(_os::UnameResultData {
             sysname: info.sysname,
             nodename: info.nodename,
