mirror of
https://github.com/ClementTsang/bottom
synced 2024-11-10 14:44:18 +00:00
deps: bump deps as of 2023-06-29 (#1233)
* deps: bump deps as of 2023-06-29, clean up Cargo.toml a bit * fix deprecated function call
This commit is contained in:
Clement Tsang
GitHub
parent
fc027ece68
commit
9c368815dd
3 changed files with 51 additions and 27 deletions
59
Cargo.lock
generated
59
Cargo.lock
generated
|
|
@ -140,6 +140,12 @@ version = "1.3.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
|
||||
|
||||
[[package]]
|
||||
name = "bottom"
|
||||
version = "0.9.4"
|
||||
|
|
@ -173,7 +179,7 @@ dependencies = [
|
|||
"predicates",
|
||||
"ratatui",
|
||||
"regex",
|
||||
"rustix",
|
||||
"rustix 0.38.0",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"starship-battery",
|
||||
|
|
@ -231,22 +237,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.3.8"
|
||||
version = "4.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211"
|
||||
checksum = "bba77a07e4489fb41bd90e8d4201c3eb246b3c2c9ea2ba0bddd6c1d1df87db7d"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.3.8"
|
||||
version = "4.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717"
|
||||
checksum = "2c9b4a88bb4bc35d3d6f65a21b0f0bafe9c894fa00978de242c555ec28bea1c0"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
"clap_lex",
|
||||
"once_cell",
|
||||
"strsim 0.10.0",
|
||||
|
|
@ -355,7 +361,7 @@ version = "0.26.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
"crossterm_winapi",
|
||||
"libc",
|
||||
"mio",
|
||||
|
|
@ -631,7 +637,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
|
|||
dependencies = [
|
||||
"hermit-abi 0.3.1",
|
||||
"io-lifetimes",
|
||||
"rustix",
|
||||
"rustix 0.37.20",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
|
|
@ -696,6 +702,12 @@ version = "0.3.8"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.10"
|
||||
|
|
@ -763,7 +775,7 @@ version = "0.26.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"static_assertions",
|
||||
|
|
@ -809,7 +821,7 @@ version = "0.9.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7cd21b9f5a1cce3c3515c9ffa85f5c7443e07162dae0ccf4339bb7ca38ad3454"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
"libloading",
|
||||
"nvml-wrapper-sys",
|
||||
"static_assertions",
|
||||
|
|
@ -925,7 +937,7 @@ version = "0.21.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce841e0486e7c2412c3740168ede33adeba8e154a15107b879d8162d77c7174e"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
"cassowary",
|
||||
"crossterm",
|
||||
"unicode-segmentation",
|
||||
|
|
@ -960,7 +972,7 @@ version = "0.2.16"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -969,7 +981,7 @@ version = "0.3.5"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1024,11 +1036,24 @@ version = "0.37.20"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
"errno",
|
||||
"io-lifetimes",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"linux-raw-sys 0.3.8",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8865954e9c990b996e5b366fad94b8d467ae530daf5f8496edd7cf75e76987d"
|
||||
dependencies = [
|
||||
"bitflags 2.3.3",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys 0.4.3",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
|
|
@ -1192,7 +1217,7 @@ version = "0.5.4"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed66d6a2ccbd656659289bc90767895b7abbdec897a0fc6031aca3ed1cb51d3e"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 1.3.2",
|
||||
"byteorder",
|
||||
"enum-as-inner",
|
||||
"libc",
|
||||
|
|
@ -1221,7 +1246,7 @@ version = "0.2.6"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
|
||||
dependencies = [
|
||||
"rustix",
|
||||
"rustix 0.37.20",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
|
|
|
|||
15
Cargo.toml
15
Cargo.toml
|
|
@ -65,20 +65,19 @@ gpu = ["nvidia"]
|
|||
nvidia = ["nvml-wrapper"]
|
||||
zfs = []
|
||||
|
||||
# The features we use by default.
|
||||
default = ["deploy"]
|
||||
# Including logging for debugging purposes.
|
||||
logging = ["fern", "log"]
|
||||
|
||||
# The features we use on deploy. Logging is not included as that is primarily (for now) just for debugging locally.
|
||||
deploy = ["battery", "gpu", "zfs"]
|
||||
|
||||
# Including logging for debugging purposes.
|
||||
logging = ["fern", "log"]
|
||||
default = ["deploy"]
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.71"
|
||||
backtrace = "0.3.67"
|
||||
cfg-if = "1.0.0"
|
||||
clap = { version = "4.3.8", features = ["default", "cargo", "wrap_help"] }
|
||||
clap = { version = "4.3.9", features = ["default", "cargo", "wrap_help"] }
|
||||
concat-string = "1.0.1"
|
||||
crossterm = "0.26.1"
|
||||
ctrlc = { version = "3.4.0", features = ["termination"] }
|
||||
|
|
@ -91,7 +90,7 @@ humantime-serde = "1.1.1"
|
|||
indexmap = "2.0.0"
|
||||
itertools = "0.11.0"
|
||||
kstring = { version = "2.0.0", features = ["arc"] }
|
||||
log = { version = "0.4.18", optional = true }
|
||||
log = { version = "0.4.19", optional = true }
|
||||
nvml-wrapper = { version = "0.9.0", optional = true }
|
||||
once_cell = "1.18.0"
|
||||
regex = "1.8.4"
|
||||
|
|
@ -109,7 +108,7 @@ unicode-width = "0.1.10"
|
|||
libc = "0.2.147"
|
||||
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
rustix = { version = "0.37.20", features = ["fs", "param", "process"] }
|
||||
rustix = { version = "0.38.0", features = ["fs", "param", "process"] }
|
||||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
core-foundation = "0.9.3"
|
||||
|
|
@ -137,7 +136,7 @@ cargo-husky = { version = "1.5.0", default-features = false, features = ["user-h
|
|||
predicates = "3.0.3"
|
||||
|
||||
[build-dependencies]
|
||||
clap = { version = "4.3.8", features = ["default", "cargo", "wrap_help"] }
|
||||
clap = { version = "4.3.9", features = ["default", "cargo", "wrap_help"] }
|
||||
clap_complete = "4.3.1"
|
||||
clap_mangen = "0.2.12"
|
||||
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ impl Process {
|
|||
// TODO: Pass in a buffer vec/string to share?
|
||||
|
||||
let fd = rustix::fs::openat(
|
||||
rustix::fs::cwd(),
|
||||
rustix::fs::CWD,
|
||||
&pid_path,
|
||||
OFlags::PATH | OFlags::DIRECTORY | OFlags::CLOEXEC,
|
||||
Mode::empty(),
|
||||
|
|
@ -224,7 +224,7 @@ impl Process {
|
|||
.last()
|
||||
.and_then(|s| s.to_string_lossy().parse::<Pid>().ok())
|
||||
.or_else(|| {
|
||||
rustix::fs::readlinkat(rustix::fs::cwd(), &pid_path, vec![])
|
||||
rustix::fs::readlinkat(rustix::fs::CWD, &pid_path, vec![])
|
||||
.ok()
|
||||
.and_then(|s| s.to_string_lossy().parse::<Pid>().ok())
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in a new issue