Skip to content

Commit 47f2f90

Browse files
Use rustix for uname; drop uname crate
1 parent e10a27b commit 47f2f90

4 files changed

Lines changed: 10 additions & 22 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ bitflagset = "0.0.3"
187187
bstr = "1"
188188
bzip2 = "0.6"
189189
caseless = "0.2.2"
190-
chrono = { version = "0.4.44", default-features = false, features = ["clock", "oldtime", "std"] }
190+
chrono = { version = "0.4.44", default-features = false, features = ["clock", "std"] }
191191
constant_time_eq = "0.4"
192192
cranelift = "0.131.0"
193193
cranelift-jit = "0.131.1"
@@ -291,7 +291,6 @@ icu_properties = "2"
291291
icu_normalizer = "2"
292292
uuid = "1.23.1"
293293
ucd = "0.1.1"
294-
uname = "0.1.1"
295294
unicode-casing = "0.1.1"
296295
unic-ucd-age = "0.9.0"
297296
unicode_names2 = "2.0.0"

crates/vm/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ icu_properties = { workspace = true }
9191
rustix = { workspace = true }
9292
nix = { workspace = true }
9393
exitcode = { workspace = true }
94-
uname = { workspace = true }
9594

9695
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
9796
rustyline = { workspace = true }

crates/vm/src/stdlib/posix.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,15 +1475,15 @@ pub mod module {
14751475
}
14761476

14771477
#[pyfunction]
1478-
fn uname(vm: &VirtualMachine) -> PyResult<_os::UnameResultData> {
1479-
let info = uname::uname().map_err(|err| err.into_pyexception(vm))?;
1480-
Ok(_os::UnameResultData {
1481-
sysname: info.sysname,
1482-
nodename: info.nodename,
1483-
release: info.release,
1484-
version: info.version,
1485-
machine: info.machine,
1486-
})
1478+
fn uname() -> _os::UnameResultData {
1479+
let info = rustix::system::uname();
1480+
_os::UnameResultData {
1481+
sysname: info.sysname().to_string_lossy().into(),
1482+
nodename: info.nodename().to_string_lossy().into(),
1483+
release: info.release().to_string_lossy().into(),
1484+
version: info.version().to_string_lossy().into(),
1485+
machine: info.machine().to_string_lossy().into(),
1486+
}
14871487
}
14881488

14891489
#[pyfunction]

0 commit comments

Comments
 (0)