diff --git a/Cargo.lock b/Cargo.lock index 42a8e5ee6e..e405df5a9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1268,7 +1268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517" dependencies = [ "cfg-if", - "rustix", + "rustix 0.35.11", "windows-sys 0.36.1", ] @@ -1884,6 +1884,16 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" +[[package]] +name = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "ipnet" version = "2.5.0" @@ -2189,6 +2199,12 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.4.9" @@ -3943,9 +3959,9 @@ dependencies = [ [[package]] name = "procfs" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfb6451c91904606a1abe93e83a8ec851f45827fa84273f256ade45dc095818" +checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f" dependencies = [ "bitflags", "byteorder", @@ -3953,7 +3969,7 @@ dependencies = [ "flate2", "hex", "lazy_static", - "rustix", + "rustix 0.36.8", ] [[package]] @@ -4464,12 +4480,26 @@ checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef" dependencies = [ "bitflags", "errno 0.2.8", - "io-lifetimes", + "io-lifetimes 0.7.3", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.46", "windows-sys 0.36.1", ] +[[package]] +name = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags", + "errno 0.2.8", + "io-lifetimes 1.0.5", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + [[package]] name = "rustversion" version = "1.0.9" @@ -5138,7 +5168,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8440c860cf79def6164e4a0a983bcc2305d82419177a0e0c71930d049e3ac5a1" dependencies = [ - "rustix", + "rustix 0.35.11", "windows-sys 0.36.1", ] diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml index 7c02d4c7aa..8abcd54c4d 100644 --- a/crates/nu-system/Cargo.toml +++ b/crates/nu-system/Cargo.toml @@ -21,7 +21,7 @@ nix = { version = "0.25", default-features = false, features = ["fs", "term", "p atty = "0.2" [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] -procfs = "0.14.0" +procfs = "0.15.1" [target.'cfg(target_os = "macos")'.dependencies] libproc = "0.12.0" diff --git a/crates/nu-system/src/linux.rs b/crates/nu-system/src/linux.rs index 70b3df08f4..c52681b9a3 100644 --- a/crates/nu-system/src/linux.rs +++ b/crates/nu-system/src/linux.rs @@ -190,8 +190,7 @@ impl ProcessInfo { let curr_time = cs.utime + cs.stime; let prev_time = ps.utime + ps.stime; - let usage_ms = - (curr_time - prev_time) * 1000 / procfs::ticks_per_second().unwrap_or(100); + let usage_ms = (curr_time - prev_time) * 1000 / procfs::ticks_per_second(); let interval_ms = self.interval.as_secs() * 1000 + u64::from(self.interval.subsec_millis()); usage_ms as f64 * 100.0 / interval_ms as f64 @@ -206,7 +205,7 @@ impl ProcessInfo { /// Memory size in number of bytes pub fn mem_size(&self) -> u64 { match self.curr_proc.stat() { - Ok(p) => p.rss_bytes().unwrap_or(0), + Ok(p) => p.rss_bytes(), Err(_) => 0, } }