Bump uucore & adapt code to its changes

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" }

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)

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] <pattern>")
         .args_override_self(true)
         .args([
             arg!(-d     --delimiter <string>    "specify output delimiter")

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<usize> {
 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")