From 3bc066ae6eb9b93063e4e93d97c79649ccb9cc0e Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 30 Dec 2025 10:47:53 +0100 Subject: [PATCH 1/2] Bump uucore from 0.2.2 to 0.5.0 --- Cargo.lock | 104 ++++++++++++----------------------------------------- Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 82 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29db0801..627eba41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,17 +88,6 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" -[[package]] -name = "bstr" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - [[package]] name = "bumpalo" version = "3.19.0" @@ -917,12 +906,6 @@ dependencies = [ "libc", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "objc2-core-foundation" version = "0.3.2" @@ -1142,7 +1125,7 @@ dependencies = [ "uu_vmstat", "uu_w", "uu_watch", - "uucore 0.2.2", + "uucore", "uutests", "xattr", ] @@ -1740,7 +1723,7 @@ dependencies = [ "bytesize", "clap", "sysinfo", - "uucore 0.2.2", + "uucore", "windows 0.62.2", ] @@ -1751,7 +1734,7 @@ dependencies = [ "clap", "regex", "rustix 1.1.3", - "uucore 0.2.2", + "uucore", "walkdir", ] @@ -1761,7 +1744,7 @@ version = "0.0.1" dependencies = [ "clap", "uu_pgrep", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1772,7 +1755,7 @@ dependencies = [ "nix", "regex", "uu_pgrep", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1783,7 +1766,7 @@ dependencies = [ "nix", "regex", "uu_pgrep", - "uucore 0.2.2", + "uucore", "walkdir", ] @@ -1793,7 +1776,7 @@ version = "0.0.1" dependencies = [ "clap", "dirs", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1805,7 +1788,7 @@ dependencies = [ "nix", "prettytable-rs", "uu_pgrep", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1814,7 +1797,7 @@ version = "0.0.1" dependencies = [ "clap", "sysinfo", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1824,7 +1807,7 @@ dependencies = [ "clap", "nix", "uu_snice", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1832,7 +1815,7 @@ name = "uu_slabtop" version = "0.0.1" dependencies = [ "clap", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1845,7 +1828,7 @@ dependencies = [ "sysinfo", "thiserror 2.0.17", "uu_pgrep", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1854,7 +1837,7 @@ version = "0.0.1" dependencies = [ "clap", "sysinfo", - "uucore 0.2.2", + "uucore", "walkdir", ] @@ -1865,7 +1848,7 @@ dependencies = [ "clap", "crossterm 0.29.0", "ratatui", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1882,7 +1865,7 @@ dependencies = [ "sysinfo", "uu_vmstat", "uu_w", - "uucore 0.2.2", + "uucore", "windows-sys 0.61.2", ] @@ -1895,7 +1878,7 @@ dependencies = [ "jiff", "terminal_size", "uu_slabtop", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1904,7 +1887,7 @@ version = "0.0.1" dependencies = [ "chrono", "clap", - "uucore 0.2.2", + "uucore", ] [[package]] @@ -1912,34 +1895,7 @@ name = "uu_watch" version = "0.0.1" dependencies = [ "clap", - "uucore 0.2.2", -] - -[[package]] -name = "uucore" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7203e48e80ac344450cba5323d8b4a71967ec1e81ae4022775ada90d2b0e08ac" -dependencies = [ - "bstr", - "chrono", - "clap", - "dns-lookup", - "fluent", - "fluent-bundle", - "fluent-syntax", - "jiff", - "libc", - "nix", - "number_prefix", - "os_display", - "thiserror 2.0.17", - "time", - "unic-langid", - "utmp-classic", - "uucore_procs 0.2.2", - "wild", - "windows-sys 0.61.2", + "uucore", ] [[package]] @@ -1948,6 +1904,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5eddd390f3fdef74f104a948559e6de29203f60f8f563c8c9f528cd4c88ee78" dependencies = [ + "chrono", "clap", "dns-lookup", "fluent", @@ -1961,19 +1918,10 @@ dependencies = [ "thiserror 2.0.17", "time", "unic-langid", - "uucore_procs 0.5.0", + "utmp-classic", + "uucore_procs", "wild", -] - -[[package]] -name = "uucore_procs" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449e64ce116ed0cc8c5897bd8706d36aed1ec027b647494df4eae6996d8d59de" -dependencies = [ - "proc-macro2", - "quote", - "uuhelp_parser", + "windows-sys 0.61.2", ] [[package]] @@ -1986,12 +1934,6 @@ dependencies = [ "quote", ] -[[package]] -name = "uuhelp_parser" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e4945611996e885dc4eeae23f3d6f20cfb6e8f4bad4985c2222bbcf9a9745" - [[package]] name = "uutests" version = "0.5.0" @@ -2006,7 +1948,7 @@ dependencies = [ "regex", "rlimit", "tempfile", - "uucore 0.5.0", + "uucore", "xattr", ] diff --git a/Cargo.toml b/Cargo.toml index fc6a2b67..0731af31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ tempfile = "3.10.1" terminal_size = "0.4.2" textwrap = { version = "0.16.1", features = ["terminal_size"] } thiserror = "2.0.4" -uucore = "0.2.2" +uucore = "0.5.0" uutests = "0.5.0" walkdir = "2.5.0" windows = { version = "0.62.0" } From 6c04c749119c886baf6d970b2c8c8bf9123b9999 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 30 Dec 2025 11:33:27 +0100 Subject: [PATCH 2/2] Adapt to uucore changes --- src/uu/free/free.md | 7 ------- src/uu/free/src/free.rs | 12 +++--------- src/uu/pgrep/pgrep.md | 7 ------- src/uu/pgrep/src/pgrep.rs | 9 +++------ src/uu/pidof/pidof.md | 7 ------- src/uu/pidof/src/pidof.rs | 9 +++------ src/uu/pidwait/pidwait.md | 7 ------- src/uu/pidwait/src/pidwait.rs | 9 +++------ src/uu/pkill/pkill.md | 7 ------- src/uu/pkill/src/pkill.rs | 9 +++------ src/uu/pmap/pmap.md | 7 ------- src/uu/pmap/src/pmap.rs | 8 ++------ src/uu/ps/ps.md | 7 ------- src/uu/ps/src/ps.rs | 12 +++--------- src/uu/pwdx/pwdx.md | 7 ------- src/uu/pwdx/src/pwdx.rs | 8 ++------ src/uu/skill/skill.md | 7 ------- src/uu/skill/src/skill.rs | 10 +++------- src/uu/slabtop/slabtop.md | 22 ---------------------- src/uu/slabtop/src/slabtop.rs | 23 ++++++++++++++++------- src/uu/snice/snice.md | 7 ------- src/uu/snice/src/snice.rs | 12 +++--------- src/uu/sysctl/src/sysctl.rs | 8 ++------ src/uu/sysctl/sysctl.md | 7 ------- src/uu/tload/src/tload.rs | 9 +++------ src/uu/tload/tload.md | 7 ------- src/uu/top/src/top.rs | 15 ++++----------- src/uu/top/top.md | 7 ------- src/uu/vmstat/src/vmstat.rs | 8 ++------ src/uu/vmstat/vmstat.md | 9 --------- src/uu/w/src/w.rs | 9 +++------ src/uu/w/w.md | 7 ------- src/uu/watch/src/watch.rs | 9 +++------ src/uu/watch/watch.md | 7 ------- 34 files changed, 61 insertions(+), 254 deletions(-) delete mode 100644 src/uu/free/free.md delete mode 100644 src/uu/pgrep/pgrep.md delete mode 100644 src/uu/pidof/pidof.md delete mode 100644 src/uu/pidwait/pidwait.md delete mode 100644 src/uu/pkill/pkill.md delete mode 100644 src/uu/pmap/pmap.md delete mode 100644 src/uu/ps/ps.md delete mode 100644 src/uu/pwdx/pwdx.md delete mode 100644 src/uu/skill/skill.md delete mode 100644 src/uu/slabtop/slabtop.md delete mode 100644 src/uu/snice/snice.md delete mode 100644 src/uu/sysctl/sysctl.md delete mode 100644 src/uu/tload/tload.md delete mode 100644 src/uu/top/top.md delete mode 100644 src/uu/vmstat/vmstat.md delete mode 100644 src/uu/w/w.md delete mode 100644 src/uu/watch/watch.md diff --git a/src/uu/free/free.md b/src/uu/free/free.md deleted file mode 100644 index f8bf67cf..00000000 --- a/src/uu/free/free.md +++ /dev/null @@ -1,7 +0,0 @@ -# free - -``` -free [options] -``` - -Display amount of free and used memory in the system diff --git a/src/uu/free/src/free.rs b/src/uu/free/src/free.rs index 97829b60..4152af9a 100644 --- a/src/uu/free/src/free.rs +++ b/src/uu/free/src/free.rs @@ -18,13 +18,7 @@ use std::ops::Mul; use std::process; use std::thread::sleep; use std::time::Duration; -use uucore::{ - error::{UResult, USimpleError}, - format_usage, help_about, help_usage, -}; - -const ABOUT: &str = help_about!("free.md"); -const USAGE: &str = help_usage!("free.md"); +use uucore::error::{UResult, USimpleError}; /// The unit of number is [UnitMultiplier::Bytes] #[derive(Default, Clone)] @@ -249,8 +243,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Display amount of free and used memory in the system") + .override_usage("free [options]") .args_override_self(true) .infer_long_args(true) .disable_help_flag(true) diff --git a/src/uu/pgrep/pgrep.md b/src/uu/pgrep/pgrep.md deleted file mode 100644 index 6382483f..00000000 --- a/src/uu/pgrep/pgrep.md +++ /dev/null @@ -1,7 +0,0 @@ -# pgrep - -``` -pgrep [options] -``` - -look up, signal, or wait for processes based on name and other attributes diff --git a/src/uu/pgrep/src/pgrep.rs b/src/uu/pgrep/src/pgrep.rs index aca0edfb..78ac1bf1 100644 --- a/src/uu/pgrep/src/pgrep.rs +++ b/src/uu/pgrep/src/pgrep.rs @@ -8,10 +8,7 @@ pub mod process; pub mod process_matcher; use clap::{arg, crate_version, Command}; -use uucore::{error::UResult, format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("pgrep.md"); -const USAGE: &str = help_usage!("pgrep.md"); +use uucore::error::UResult; /// # Conceptual model of `pgrep` /// @@ -74,8 +71,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("look up, signal, or wait for processes based on name and other attributes") + .override_usage("pgrep [options] ") .args_override_self(true) .args([ arg!(-d --delimiter "specify output delimiter") diff --git a/src/uu/pidof/pidof.md b/src/uu/pidof/pidof.md deleted file mode 100644 index 76119f96..00000000 --- a/src/uu/pidof/pidof.md +++ /dev/null @@ -1,7 +0,0 @@ -# pidof - -``` -pidof [options] [program [...]] -``` - -Find the process ID of a running program diff --git a/src/uu/pidof/src/pidof.rs b/src/uu/pidof/src/pidof.rs index 85d1f7e2..2c09a247 100644 --- a/src/uu/pidof/src/pidof.rs +++ b/src/uu/pidof/src/pidof.rs @@ -7,12 +7,9 @@ use std::path::PathBuf; use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; use uu_pgrep::process::{walk_process, ProcessInformation}; +use uucore::error::UResult; #[cfg(unix)] use uucore::process::geteuid; -use uucore::{error::UResult, format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("pidof.md"); -const USAGE: &str = help_usage!("pidof.md"); #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { @@ -147,8 +144,8 @@ fn collect_matched_pids(matches: &ArgMatches) -> Vec { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Find the process ID of a running program") + .override_usage("pidof [options] [program [...]]") .infer_long_args(true) .arg( Arg::new("program-name") diff --git a/src/uu/pidwait/pidwait.md b/src/uu/pidwait/pidwait.md deleted file mode 100644 index fb60ef53..00000000 --- a/src/uu/pidwait/pidwait.md +++ /dev/null @@ -1,7 +0,0 @@ -# pidwait - -``` -pidwait [options] pattern -``` - -Wait for processes based on name. diff --git a/src/uu/pidwait/src/pidwait.rs b/src/uu/pidwait/src/pidwait.rs index a3129b4e..281d812f 100644 --- a/src/uu/pidwait/src/pidwait.rs +++ b/src/uu/pidwait/src/pidwait.rs @@ -5,14 +5,11 @@ use clap::{arg, crate_version, Command}; use uu_pgrep::process_matcher; -use uucore::{error::UResult, format_usage, help_about, help_usage}; +use uucore::error::UResult; use wait::wait; mod wait; -const ABOUT: &str = help_about!("pidwait.md"); -const USAGE: &str = help_usage!("pidwait.md"); - #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { let matches = uu_app().try_get_matches_from(args)?; @@ -50,8 +47,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Wait for processes based on name") + .override_usage("pidwait [options] pattern") .infer_long_args(true) .args([arg!(-e --echo "display PIDs before waiting")]) .args(process_matcher::clap_args( diff --git a/src/uu/pkill/pkill.md b/src/uu/pkill/pkill.md deleted file mode 100644 index c8353288..00000000 --- a/src/uu/pkill/pkill.md +++ /dev/null @@ -1,7 +0,0 @@ -# pgrep - -``` -pkill [options] -``` - -Kills processes based on name and other attributes. diff --git a/src/uu/pkill/src/pkill.rs b/src/uu/pkill/src/pkill.rs index 8659433b..e6fbaa44 100644 --- a/src/uu/pkill/src/pkill.rs +++ b/src/uu/pkill/src/pkill.rs @@ -15,16 +15,13 @@ use std::io::Error; #[cfg(unix)] use uu_pgrep::process::ProcessInformation; use uu_pgrep::process_matcher; +use uucore::error::UResult; #[cfg(unix)] use uucore::{ error::FromIo, show, signals::{signal_by_name_or_value, signal_name_by_value}, }; -use uucore::{error::UResult, format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("pkill.md"); -const USAGE: &str = help_usage!("pkill.md"); #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { @@ -133,8 +130,8 @@ fn kill(pids: &Vec, sig: Option, queue: Option, pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Kills processes based on name and other attributes") + .override_usage("pkill [options] ") .args_override_self(true) .args([ // arg!(- "signal to send (either number or name)"), diff --git a/src/uu/pmap/pmap.md b/src/uu/pmap/pmap.md deleted file mode 100644 index 9aabe542..00000000 --- a/src/uu/pmap/pmap.md +++ /dev/null @@ -1,7 +0,0 @@ -# pmap - -``` -pmap [options] pid [...] -``` - -Report memory map of a process diff --git a/src/uu/pmap/src/pmap.rs b/src/uu/pmap/src/pmap.rs index 05a046e6..20011348 100644 --- a/src/uu/pmap/src/pmap.rs +++ b/src/uu/pmap/src/pmap.rs @@ -11,15 +11,11 @@ use std::env; use std::fs; use std::io::{Error, ErrorKind}; use uucore::error::{set_exit_code, UResult, USimpleError}; -use uucore::{format_usage, help_about, help_usage}; mod maps_format_parser; mod pmap_config; mod smaps_format_parser; -const ABOUT: &str = help_about!("pmap.md"); -const USAGE: &str = help_usage!("pmap.md"); - mod options { pub const PID: &str = "pid"; pub const EXTENDED: &str = "extended"; @@ -440,8 +436,8 @@ fn output_device_format(pid: &str, pmap_config: &PmapConfig) -> Result<(), Error pub fn uu_app() -> Command { Command::new(env!("CARGO_PKG_NAME")) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Report memory map of a process") + .override_usage("pmap [options] pid [...]") .infer_long_args(true) .arg( Arg::new(options::PID) diff --git a/src/uu/ps/ps.md b/src/uu/ps/ps.md deleted file mode 100644 index 2765c37b..00000000 --- a/src/uu/ps/ps.md +++ /dev/null @@ -1,7 +0,0 @@ -# ps - -``` -ps [options] -``` - -Report a snapshot of the current processes. diff --git a/src/uu/ps/src/ps.rs b/src/uu/ps/src/ps.rs index 671b3f27..8254811e 100644 --- a/src/uu/ps/src/ps.rs +++ b/src/uu/ps/src/ps.rs @@ -23,13 +23,7 @@ use process_selection::ProcessSelectionSettings; use std::cell::RefCell; #[cfg(unix)] use uucore::entries::{grp2gid, usr2uid}; -use uucore::{ - error::{UError, UResult, USimpleError}, - format_usage, help_about, help_usage, -}; - -const ABOUT: &str = help_about!("ps.md"); -const USAGE: &str = help_usage!("ps.md"); +use uucore::error::{UError, UResult, USimpleError}; #[cfg(not(unix))] pub fn usr2uid(_name: &str) -> std::io::Result { @@ -199,8 +193,8 @@ fn parse_command_list(s: &str) -> Result, String> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Report a snapshot of the current processes") + .override_usage("ps [options]") .infer_long_args(true) .disable_help_flag(true) .arg(Arg::new("help").long("help").action(ArgAction::Help)) diff --git a/src/uu/pwdx/pwdx.md b/src/uu/pwdx/pwdx.md deleted file mode 100644 index 0efb6d6f..00000000 --- a/src/uu/pwdx/pwdx.md +++ /dev/null @@ -1,7 +0,0 @@ -# pwdx - -``` -pwdx [options] pid [...] -``` - -Report current working directory of a process \ No newline at end of file diff --git a/src/uu/pwdx/src/pwdx.rs b/src/uu/pwdx/src/pwdx.rs index d3e3c569..aeca5a2d 100644 --- a/src/uu/pwdx/src/pwdx.rs +++ b/src/uu/pwdx/src/pwdx.rs @@ -7,10 +7,6 @@ use clap::{crate_version, Arg, Command}; use std::env; use sysinfo::{Pid, System}; use uucore::error::{set_exit_code, UResult, USimpleError}; -use uucore::{format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("pwdx.md"); -const USAGE: &str = help_usage!("pwdx.md"); #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { @@ -52,8 +48,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Report current working directory of a process") + .override_usage("pwdx [options] pid [...]") .infer_long_args(true) .arg( Arg::new("pid") diff --git a/src/uu/skill/skill.md b/src/uu/skill/skill.md deleted file mode 100644 index 8fdb454c..00000000 --- a/src/uu/skill/skill.md +++ /dev/null @@ -1,7 +0,0 @@ -# skill - -``` -skill [signal] [options] -``` - -Report processes matching an expression and send a signal to them. \ No newline at end of file diff --git a/src/uu/skill/src/skill.rs b/src/uu/skill/src/skill.rs index ff851a86..2dce8cbf 100644 --- a/src/uu/skill/src/skill.rs +++ b/src/uu/skill/src/skill.rs @@ -9,13 +9,9 @@ use nix::{sys::signal, sys::signal::Signal, unistd::Pid}; use uu_snice::{ collect_pids, construct_verbose_result, print_signals, process_matcher, ActionResult, }; -use uucore::error::USimpleError; +use uucore::error::{UResult, USimpleError}; #[cfg(unix)] use uucore::signals::signal_by_name_or_value; -use uucore::{error::UResult, format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("skill.md"); -const USAGE: &str = help_usage!("skill.md"); #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { @@ -93,8 +89,8 @@ fn perform_action( pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Report processes matching an expression and send a signal to them") + .override_usage("skill [signal] [options] ") .infer_long_args(true) .arg_required_else_help(true) .arg(Arg::new("signal")) diff --git a/src/uu/slabtop/slabtop.md b/src/uu/slabtop/slabtop.md deleted file mode 100644 index 884bbb87..00000000 --- a/src/uu/slabtop/slabtop.md +++ /dev/null @@ -1,22 +0,0 @@ -# slabtop - -``` -slabtop [options] -``` - -Display kernel slab cache information in real time - -## After Help - -The following are valid sort criteria: - -* `a` sort by number of active objects -* `b` sort by objects per slab -* `c` sort by cache size -* `l` sort by number of slabs -* `v` sort by (non display) number of active slabs -* `n` sort by name -* `o` sort by number of objects (the default) -* `p` sort by (non display) pages per slab -* `s` sort by object size -* `u` sort by cache utilization diff --git a/src/uu/slabtop/src/slabtop.rs b/src/uu/slabtop/src/slabtop.rs index 1dc5c91f..7785975a 100644 --- a/src/uu/slabtop/src/slabtop.rs +++ b/src/uu/slabtop/src/slabtop.rs @@ -5,11 +5,7 @@ pub use crate::parse::SlabInfo; use clap::{arg, crate_version, ArgAction, Command}; -use uucore::{error::UResult, format_usage, help_about, help_section, help_usage}; - -const ABOUT: &str = help_about!("slabtop.md"); -const AFTER_HELP: &str = help_section!("after help", "slabtop.md"); -const USAGE: &str = help_usage!("slabtop.md"); +use uucore::error::UResult; mod parse; @@ -125,10 +121,23 @@ fn output_list(info: &SlabInfo) { #[allow(clippy::cognitive_complexity)] pub fn uu_app() -> Command { + const AFTER_HELP: &str = "The following are valid sort criteria: + + a sort by number of active objects + b sort by objects per slab + c sort by cache size + l sort by number of slabs + v sort by (non display) number of active slabs + n sort by name + o sort by number of objects (the default) + p sort by (non display) pages per slab + s sort by object size + u sort by cache utilization"; + Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Display kernel slab cache information in real time") + .override_usage("slabtop [options]") .infer_long_args(true) .args([ // arg!(-d --delay "delay updates"), diff --git a/src/uu/snice/snice.md b/src/uu/snice/snice.md deleted file mode 100644 index 0062de0d..00000000 --- a/src/uu/snice/snice.md +++ /dev/null @@ -1,7 +0,0 @@ -# snice - -``` -snice [priority] [options] expression -``` - -Send a signal or report process status diff --git a/src/uu/snice/src/snice.rs b/src/uu/snice/src/snice.rs index d9c13f37..92efbaf9 100644 --- a/src/uu/snice/src/snice.rs +++ b/src/uu/snice/src/snice.rs @@ -14,15 +14,9 @@ use std::collections::HashSet; use std::io::Write; use sysinfo::Pid; use uu_pgrep::process::ProcessInformation; +use uucore::error::{UResult, USimpleError}; #[cfg(target_family = "unix")] use uucore::signals::ALL_SIGNALS; -use uucore::{ - error::{UResult, USimpleError}, - format_usage, help_about, help_usage, -}; - -const ABOUT: &str = help_about!("snice.md"); -const USAGE: &str = help_usage!("snice.md"); mod action; mod priority; @@ -238,8 +232,8 @@ pub fn collect_pids(targets: &[SelectedTarget]) -> Vec { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Send a signal or report process status") + .override_usage("snice [priority] [options] expression") .infer_long_args(true) .arg_required_else_help(true) .arg(Arg::new("priority")) diff --git a/src/uu/sysctl/src/sysctl.rs b/src/uu/sysctl/src/sysctl.rs index f0cd3721..7f40f562 100644 --- a/src/uu/sysctl/src/sysctl.rs +++ b/src/uu/sysctl/src/sysctl.rs @@ -6,10 +6,6 @@ use clap::{crate_version, Arg, ArgAction, Command}; use std::env; use uucore::error::UResult; -use uucore::{format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("sysctl.md"); -const USAGE: &str = help_usage!("sysctl.md"); #[cfg(target_os = "linux")] mod linux { @@ -138,8 +134,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Show or modify kernel parameters at runtime") + .override_usage("sysctl [options] [variable[=value]]...") .infer_long_args(true) .arg( Arg::new("variables") diff --git a/src/uu/sysctl/sysctl.md b/src/uu/sysctl/sysctl.md deleted file mode 100644 index 94e4b12c..00000000 --- a/src/uu/sysctl/sysctl.md +++ /dev/null @@ -1,7 +0,0 @@ -# sysctl - -``` -sysctl [options] [variable[=value]]... -``` - -Show or modify kernel parameters at runtime. diff --git a/src/uu/tload/src/tload.rs b/src/uu/tload/src/tload.rs index bd805309..356197f2 100644 --- a/src/uu/tload/src/tload.rs +++ b/src/uu/tload/src/tload.rs @@ -11,10 +11,7 @@ use std::time::Duration; use clap::{arg, crate_version, value_parser, ArgAction, ArgMatches, Command}; use crossterm::event::{self, KeyCode, KeyEvent, KeyModifiers}; use tui::{LegacyTui, ModernTui}; -use uucore::{error::UResult, format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("tload.md"); -const USAGE: &str = help_usage!("tload.md"); +use uucore::error::UResult; mod tui; @@ -143,8 +140,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("tload prints a graph of the current system load average to the specified tty (or the tty of the tload process if none is specified)") + .override_usage("tload [options] [tty]") .infer_long_args(true) .args([ arg!(-d --delay "update delay in seconds") diff --git a/src/uu/tload/tload.md b/src/uu/tload/tload.md deleted file mode 100644 index eea64d24..00000000 --- a/src/uu/tload/tload.md +++ /dev/null @@ -1,7 +0,0 @@ -# tload - -``` -tload [options] [tty] -``` - -tload prints a graph of the current system load average to the specified tty (or the tty of the tload process if none is specified). diff --git a/src/uu/top/src/top.rs b/src/uu/top/src/top.rs index 93a75de5..b3a31e7d 100644 --- a/src/uu/top/src/top.rs +++ b/src/uu/top/src/top.rs @@ -8,21 +8,14 @@ use crate::picker::Column; use crate::tui::stat::TuiStat; use crate::tui::{handle_input, Tui}; use clap::{arg, crate_version, value_parser, ArgAction, ArgGroup, ArgMatches, Command}; -use picker::pickers; -use picker::sysinfo; +use picker::{pickers, sysinfo}; use ratatui::crossterm::event; use ratatui::prelude::Widget; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::{Arc, RwLock}; use std::{thread, thread::sleep, time::Duration}; use sysinfo::{Pid, Users}; -use uucore::{ - error::{UResult, USimpleError}, - format_usage, help_about, help_usage, -}; - -const ABOUT: &str = help_about!("top.md"); -const USAGE: &str = help_usage!("top.md"); +use uucore::error::{UResult, USimpleError}; mod action; mod field; @@ -310,8 +303,8 @@ fn construct_filter(tui_stat: &TuiStat) -> Box bool> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Display Linux processes") + .override_usage("top [options]") .infer_long_args(true) .args([ // arg!(-b --"batch-mode" "run in non-interactive batch mode"), diff --git a/src/uu/top/top.md b/src/uu/top/top.md deleted file mode 100644 index 96e49229..00000000 --- a/src/uu/top/top.md +++ /dev/null @@ -1,7 +0,0 @@ -# top - -``` -top [options] -``` - -Display Linux processes diff --git a/src/uu/vmstat/src/vmstat.rs b/src/uu/vmstat/src/vmstat.rs index 67c14b26..5e565ab7 100644 --- a/src/uu/vmstat/src/vmstat.rs +++ b/src/uu/vmstat/src/vmstat.rs @@ -15,10 +15,6 @@ use clap::{arg, crate_version, ArgMatches, Command}; pub use parser::*; #[allow(unused_imports)] use uucore::error::{UResult, USimpleError}; -use uucore::{format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("vmstat.md"); -const USAGE: &str = help_usage!("vmstat.md"); #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { @@ -292,8 +288,8 @@ fn print_data( pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Report virtual memory statistics") + .override_usage("vmstat [options]") .infer_long_args(true) .args([ arg!( "The delay between updates in seconds") diff --git a/src/uu/vmstat/vmstat.md b/src/uu/vmstat/vmstat.md deleted file mode 100644 index 150340f8..00000000 --- a/src/uu/vmstat/vmstat.md +++ /dev/null @@ -1,9 +0,0 @@ -# vmstat - -usage: - -```bash -vmstat [options] -``` - -Report virtual memory statistics \ No newline at end of file diff --git a/src/uu/w/src/w.rs b/src/uu/w/src/w.rs index 3a49d5c0..c9b008ec 100644 --- a/src/uu/w/src/w.rs +++ b/src/uu/w/src/w.rs @@ -10,6 +10,7 @@ use clap::{Arg, ArgAction, Command}; #[cfg(target_os = "linux")] use std::{collections::HashMap, fs, path::Path, time::SystemTime}; use std::{process, time::Duration}; +use uucore::error::UResult; #[cfg(target_os = "linux")] use uucore::libc::{sysconf, _SC_CLK_TCK}; use uucore::uptime::{ @@ -17,10 +18,6 @@ use uucore::uptime::{ }; #[cfg(target_os = "linux")] use uucore::utmpx::Utmpx; -use uucore::{error::UResult, format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("w.md"); -const USAGE: &str = help_usage!("w.md"); struct UserInfo { user: String, @@ -316,8 +313,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Show who is logged on and what they are doing") + .override_usage("w [options] [user]") .infer_long_args(true) .disable_help_flag(true) .arg( diff --git a/src/uu/w/w.md b/src/uu/w/w.md deleted file mode 100644 index 35ac3abc..00000000 --- a/src/uu/w/w.md +++ /dev/null @@ -1,7 +0,0 @@ -# w - -``` -w [options] [user] -``` - -Show who is logged on and what they are doing diff --git a/src/uu/watch/src/watch.rs b/src/uu/watch/src/watch.rs index abf2db2c..e5bdb0aa 100644 --- a/src/uu/watch/src/watch.rs +++ b/src/uu/watch/src/watch.rs @@ -10,10 +10,7 @@ use std::num::ParseIntError; use std::process::{Command as SystemCommand, Stdio}; use std::thread::sleep; use std::time::Duration; -use uucore::{error::UResult, format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("watch.md"); -const USAGE: &str = help_usage!("watch.md"); +use uucore::error::UResult; fn parse_interval(input: &str) -> Result { // Find index where to split string into seconds and nanos @@ -109,8 +106,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Execute a program periodically, showing output fullscreen") + .override_usage("watch [options] command") .infer_long_args(true) .arg( Arg::new("command") diff --git a/src/uu/watch/watch.md b/src/uu/watch/watch.md deleted file mode 100644 index 0fc7a3b5..00000000 --- a/src/uu/watch/watch.md +++ /dev/null @@ -1,7 +0,0 @@ -# watch - -``` -watch [options] command -``` - -Execute a program periodically, showing output fullscreen \ No newline at end of file