From de0fb8ea5722a0782bcc9509f0014c4ddcb5633d Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Sun, 12 Sep 2021 13:05:06 -0400 Subject: [PATCH 1/2] bug: fix crashes for kernel versions > 255 Solved by updating procfs to 0.10.1. Thanks to hasali19 for finding and looking into this! --- CHANGELOG.md | 4 ++++ Cargo.lock | 4 ++-- Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c0a1e5e8..45106947e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#557](https://github.com/ClementTsang/bottom/pull/557): Add '/s' to network usage legend. +## Bug Fixes + +- [](): Updates the procfs library to not crash on kernel version >255. + ## Internal Changes - [#551](https://github.com/ClementTsang/bottom/pull/551): Disable AUR package generation in release pipeline since it's now in community. diff --git a/Cargo.lock b/Cargo.lock index d4b770369..43480929b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1201,9 +1201,9 @@ dependencies = [ [[package]] name = "procfs" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8809e0c18450a2db0f236d2a44ec0b4c1412d0eb936233579f0990faa5d5cd" +checksum = "95e344cafeaeefe487300c361654bcfc85db3ac53619eeccced29f5ea18c4c70" dependencies = [ "bitflags", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index ad710d624..56f7e3fea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ libc = "0.2.86" [target.'cfg(target_os = "linux")'.dependencies] heim = { version = "0.1.0-rc.1", features = ["cpu", "disk", "net", "sensors"] } -procfs = "0.9.1" +procfs = "0.10.1" smol = "1.2.5" [target.'cfg(target_os = "macos")'.dependencies] From f534c3ababf3f3101ebf5013dfc378ba3850fdc7 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Sun, 12 Sep 2021 13:06:58 -0400 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45106947e..8b655881f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,15 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Changes -- [#557](https://github.com/ClementTsang/bottom/pull/557): Add '/s' to network usage legend. +- [#557](https://github.com/ClementTsang/bottom/pull/557): Add '/s' to network usage legend to better indicate that it's a per-second change. ## Bug Fixes -- [](): Updates the procfs library to not crash on kernel version >255. +- [#575](https://github.com/ClementTsang/bottom/pull/575): Updates the procfs library to not crash on kernel version >255. ## Internal Changes - [#551](https://github.com/ClementTsang/bottom/pull/551): Disable AUR package generation in release pipeline since it's now in community. +- [#570](https://github.com/ClementTsang/bottom/pull/570): Make battery features optional in compilation. ## [0.6.3] - 2021-07-18