Merge branch 'master' into clap

This commit is contained in:
Twan Stok 2023-03-19 21:47:28 +01:00
commit ca87be93b6
3 changed files with 4 additions and 20 deletions

20
Cargo.lock generated
View File

@ -216,7 +216,7 @@ dependencies = [
"clap_mangen",
"concat-string",
"const_format",
"crossterm 0.26.1",
"crossterm",
"ctrlc",
"dirs",
"fern",
@ -473,22 +473,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "crossterm"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
dependencies = [
"bitflags",
"crossterm_winapi",
"libc",
"mio",
"parking_lot",
"signal-hook",
"signal-hook-mio",
"winapi",
]
[[package]]
name = "crossterm_winapi"
version = "0.9.0"
@ -1729,7 +1713,7 @@ checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1"
dependencies = [
"bitflags",
"cassowary",
"crossterm 0.25.0",
"crossterm",
"unicode-segmentation",
"unicode-width",
]

View File

@ -78,7 +78,7 @@ cfg-if = "1.0.0"
clap = { version = "3.2.2", features = ["default", "cargo", "wrap_help"] }
concat-string = "1.0.1"
const_format = "0.2.30"
crossterm = "0.26.1"
crossterm = "0.25.0"
ctrlc = { version = "3.2.5", features = ["termination"] }
dirs = "4.0.0"
fern = { version = "0.6.1", optional = true }

View File

@ -76,7 +76,7 @@ As (yet another) process/system visualization and management application, bottom
- [Kill signals](https://clementtsang.github.io/bottom/nightly/usage/widgets/process/#process-termination)
- [Tree mode](https://clementtsang.github.io/bottom/nightly/usage/widgets/process/#tree-mode)
- Cross-platform support for Linux, macOS, and Windows, with more planned in the future.
- [Cross-platform support](https://github.com/ClementTsang/bottom#support) for Linux, macOS, and Windows, with more planned in the future.
- [Customizable behaviour](https://clementtsang.github.io/bottom/nightly/configuration/command-line-flags/) that can be controlled with command-line flags or a config file, such as: