RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-30 12:37:49 +00:00
Code Issues Activity

sum: update to clap 4

Browse source
This commit is contained in:
Terts Diepraam 2022-10-01 00:15:21 +02:00
parent 5722e47474
commit 02f6d4d5c8
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/uu/sum/Cargo.toml
View file

@ -15,7 +15,7 @@ edition = "2021"
path = "src/sum.rs" path = "src/sum.rs"
[dependencies] [dependencies]
clap = { version = "3.2", features = ["wrap_help", "cargo"] } clap = { version = "4.0", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.16", package="uucore", path="../../uucore" } uucore = { version=">=0.0.16", package="uucore", path="../../uucore" }
[[bin]] [[bin]]

14
src/uu/sum/src/sum.rs
View file

@ -10,7 +10,7 @@
#[macro_use] #[macro_use]
extern crate uucore; extern crate uucore;
use clap::{crate_version, Arg, Command}; use clap::{crate_version, Arg, ArgAction, Command};
use std::fs::File; use std::fs::File;
use std::io::{stdin, Read}; use std::io::{stdin, Read};
use std::path::Path; use std::path::Path;
@ -118,7 +118,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
None => vec!["-".to_owned()], None => vec!["-".to_owned()],
}; };
let sysv = matches.contains_id(options::SYSTEM_V_COMPATIBLE); let sysv = matches.get_flag(options::SYSTEM_V_COMPATIBLE);
let print_names = if sysv { let print_names = if sysv {
files.len() > 1 || files[0] != "-" files.len() > 1 || files[0] != "-"
@ -149,7 +149,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
Ok(()) Ok(())
} }
pub fn uu_app<'a>() -> Command<'a> { pub fn uu_app() -> Command {
Command::new(uucore::util_name()) Command::new(uucore::util_name())
.name(NAME) .name(NAME)
.version(crate_version!()) .version(crate_version!())
@ -158,19 +158,21 @@ pub fn uu_app<'a>() -> Command<'a> {
.infer_long_args(true) .infer_long_args(true)
.arg( .arg(
Arg::new(options::FILE) Arg::new(options::FILE)
.multiple_occurrences(true) .action(ArgAction::Append)
.hide(true) .hide(true)
.value_hint(clap::ValueHint::FilePath), .value_hint(clap::ValueHint::FilePath),
) )
.arg( .arg(
Arg::new(options::BSD_COMPATIBLE) Arg::new(options::BSD_COMPATIBLE)
.short('r') .short('r')
.help("use the BSD sum algorithm, use 1K blocks (default)"), .help("use the BSD sum algorithm, use 1K blocks (default)")
.action(ArgAction::SetTrue),
) )
.arg( .arg(
Arg::new(options::SYSTEM_V_COMPATIBLE) Arg::new(options::SYSTEM_V_COMPATIBLE)
.short('s') .short('s')
.long(options::SYSTEM_V_COMPATIBLE) .long(options::SYSTEM_V_COMPATIBLE)
.help("use System V sum algorithm, use 512 bytes blocks"), .help("use System V sum algorithm, use 512 bytes blocks")
.action(ArgAction::SetTrue),
) )
} }