RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-02 05:57:46 +00:00
Code Issues Activity

head: update to clap 4

Browse source
This commit is contained in:
Terts Diepraam 2022-09-29 18:44:01 +02:00
parent b95c5ce279
commit 4f3c94968e
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

30
src/uu/head/src/head.rs
View file

@ -5,7 +5,7 @@
// spell-checker:ignore (vars) zlines BUFWRITER seekable // spell-checker:ignore (vars) zlines BUFWRITER seekable
use clap::{crate_version, Arg, ArgMatches, Command}; use clap::{crate_version, Arg, ArgAction, ArgMatches, Command};
use std::ffi::OsString; use std::ffi::OsString;
use std::io::{self, BufWriter, ErrorKind, Read, Seek, SeekFrom, Write}; use std::io::{self, BufWriter, ErrorKind, Read, Seek, SeekFrom, Write};
use uucore::display::Quotable; use uucore::display::Quotable;
@ -41,7 +41,7 @@ mod take;
use take::take_all_but; use take::take_all_but;
use take::take_lines; use take::take_lines;
pub fn uu_app<'a>() -> Command<'a> { pub fn uu_app() -> Command {
Command::new(uucore::util_name()) Command::new(uucore::util_name())
.version(crate_version!()) .version(crate_version!())
.about(ABOUT) .about(ABOUT)
@ -52,7 +52,6 @@ pub fn uu_app<'a>() -> Command<'a> {
.short('c') .short('c')
.long("bytes") .long("bytes")
.value_name("[-]NUM") .value_name("[-]NUM")
.takes_value(true)
.help( .help(
"\ "\
print the first NUM bytes of each file;\n\ print the first NUM bytes of each file;\n\
@ -68,7 +67,6 @@ pub fn uu_app<'a>() -> Command<'a> {
.short('n') .short('n')
.long("lines") .long("lines")
.value_name("[-]NUM") .value_name("[-]NUM")
.takes_value(true)
.help( .help(
"\ "\
print the first NUM lines instead of the first 10;\n\ print the first NUM lines instead of the first 10;\n\
@ -85,31 +83,35 @@ pub fn uu_app<'a>() -> Command<'a> {
.long("quiet") .long("quiet")
.visible_alias("silent") .visible_alias("silent")
.help("never print headers giving file names") .help("never print headers giving file names")
.overrides_with_all(&[options::VERBOSE_NAME, options::QUIET_NAME]), .overrides_with_all(&[options::VERBOSE_NAME, options::QUIET_NAME])
.action(ArgAction::SetTrue),
) )
.arg( .arg(
Arg::new(options::VERBOSE_NAME) Arg::new(options::VERBOSE_NAME)
.short('v') .short('v')
.long("verbose") .long("verbose")
.help("always print headers giving file names") .help("always print headers giving file names")
.overrides_with_all(&[options::QUIET_NAME, options::VERBOSE_NAME]), .overrides_with_all(&[options::QUIET_NAME, options::VERBOSE_NAME])
.action(ArgAction::SetTrue),
) )
.arg( .arg(
Arg::new(options::PRESUME_INPUT_PIPE) Arg::new(options::PRESUME_INPUT_PIPE)
.long("-presume-input-pipe") .long("presume-input-pipe")
.alias("-presume-input-pipe") .alias("-presume-input-pipe")
.hide(true), .hide(true)
.action(ArgAction::SetTrue),
) )
.arg( .arg(
Arg::new(options::ZERO_NAME) Arg::new(options::ZERO_NAME)
.short('z') .short('z')
.long("zero-terminated") .long("zero-terminated")
.help("line delimiter is NUL, not newline") .help("line delimiter is NUL, not newline")
.overrides_with(options::ZERO_NAME), .overrides_with(options::ZERO_NAME)
.action(ArgAction::SetTrue),
) )
.arg( .arg(
Arg::new(options::FILES_NAME) Arg::new(options::FILES_NAME)
.multiple_occurrences(true) .action(ArgAction::Append)
.value_hint(clap::ValueHint::FilePath), .value_hint(clap::ValueHint::FilePath),
) )
} }
@ -199,10 +201,10 @@ impl HeadOptions {
pub fn get_from(matches: &clap::ArgMatches) -> Result<Self, String> { pub fn get_from(matches: &clap::ArgMatches) -> Result<Self, String> {
let mut options = Self::default(); let mut options = Self::default();
options.quiet = matches.contains_id(options::QUIET_NAME); options.quiet = matches.get_flag(options::QUIET_NAME);
options.verbose = matches.contains_id(options::VERBOSE_NAME); options.verbose = matches.get_flag(options::VERBOSE_NAME);
options.zeroed = matches.contains_id(options::ZERO_NAME); options.zeroed = matches.get_flag(options::ZERO_NAME);
options.presume_input_pipe = matches.contains_id(options::PRESUME_INPUT_PIPE); options.presume_input_pipe = matches.get_flag(options::PRESUME_INPUT_PIPE);
options.mode = Mode::from(matches)?; options.mode = Mode::from(matches)?;