diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 823dad1..ae99c6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: override: true - name: Cache Cargo dependencies - uses: Swatinem/rust-cache@v1 + uses: Swatinem/rust-cache@v2 - name: Build uses: actions-rs/cargo@v1 @@ -78,7 +78,7 @@ jobs: override: true - name: Cache Cargo dependencies - uses: Swatinem/rust-cache@v1 + uses: Swatinem/rust-cache@v2 - name: Setup cargo-tarpaulin shell: bash diff --git a/Cargo.lock b/Cargo.lock index 8173c95..240d799 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -239,6 +239,18 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +[[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "flate2" version = "1.0.24" @@ -308,6 +320,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -529,9 +547,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] @@ -556,11 +574,10 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" dependencies = [ - "autocfg", "crossbeam-deque", "either", "rayon-core", @@ -568,9 +585,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -663,18 +680,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ "proc-macro2", "quote", @@ -683,9 +700,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa", "ryu", @@ -728,9 +745,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2", "quote", @@ -739,12 +756,13 @@ dependencies = [ [[package]] name = "sysctl" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f99d037b2bef227ab8963f4b0acc33ecbb1f9a2e7365add7789372b387ec19e1" +checksum = "ed66d6a2ccbd656659289bc90767895b7abbdec897a0fc6031aca3ed1cb51d3e" dependencies = [ "bitflags", "byteorder", + "enum-as-inner", "libc", "thiserror", "walkdir", @@ -782,7 +800,7 @@ dependencies = [ "copypasta-ext", "getopts", "systeroid-core", - "termion", + "termion 2.0.1", "thiserror", "tui", "unicode-width", @@ -800,6 +818,18 @@ dependencies = [ "redox_termios", ] +[[package]] +name = "termion" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "659c1f379f3408c7e5e84c7d0da6d93404e3800b6b9d063ba24436419302ec90" +dependencies = [ + "libc", + "numtoa", + "redox_syscall", + "redox_termios", +] + [[package]] name = "thiserror" version = "1.0.37" @@ -837,7 +867,7 @@ checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" dependencies = [ "bitflags", "cassowary", - "termion", + "termion 1.5.6", "unicode-segmentation", "unicode-width", ] diff --git a/systeroid-core/Cargo.toml b/systeroid-core/Cargo.toml index 0d17abb..b2e70f1 100644 --- a/systeroid-core/Cargo.toml +++ b/systeroid-core/Cargo.toml @@ -12,13 +12,13 @@ edition = "2021" rust-version = "1.56.1" [dependencies] -sysctl = "0.5.2" +sysctl = "0.5.4" thiserror = "1.0.37" lazy_static = "1.4.0" -rayon = "1.5.3" +rayon = "1.6.0" colored = "2.0.0" -serde = { version = "1.0.147", features = ["derive"] } -serde_json = "1.0.87" +serde = { version = "1.0.150", features = ["derive"] } +serde_json = "1.0.89" dirs-next = "2.0.0" parseit = { version = "0.1.1", features = ["gzip"] } rust-ini = "0.18.0" diff --git a/systeroid-tui/Cargo.toml b/systeroid-tui/Cargo.toml index d38027c..602d5b8 100644 --- a/systeroid-tui/Cargo.toml +++ b/systeroid-tui/Cargo.toml @@ -18,7 +18,7 @@ default = ["clipboard"] clipboard = ["copypasta-ext"] [dependencies] -termion = "1.5.6" +termion = "2.0.1" unicode-width = "0.1.10" thiserror = "1.0.37" getopts = "0.2.21" diff --git a/systeroid-tui/src/main.rs b/systeroid-tui/src/main.rs index 7fc2d90..aa49d83 100644 --- a/systeroid-tui/src/main.rs +++ b/systeroid-tui/src/main.rs @@ -5,7 +5,7 @@ use systeroid_tui::args::Args; use systeroid_tui::error::Result; use termion::input::MouseTerminal; use termion::raw::IntoRawMode; -use termion::screen::AlternateScreen; +use termion::screen::IntoAlternateScreen; use tui::backend::TermionBackend; fn main() -> Result<()> { @@ -13,7 +13,7 @@ fn main() -> Result<()> { let output = io::stderr(); let output = output.into_raw_mode()?; let output = MouseTerminal::from(output); - let output = AlternateScreen::from(output); + let output = output.into_alternate_screen()?; let backend = TermionBackend::new(output); match systeroid_tui::run(args, backend) { Ok(_) => process::exit(0),