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

use match guard to minimize

Browse source
This commit is contained in:
TechHara 2022-12-13 01:10:48 -05:00
parent 50c8bd4c6b
commit f334ae3149
1 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/uu/cut/src/cut.rs
View file

@ -551,11 +551,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let zero_terminated = matches.get_flag(options::ZERO_TERMINATED); let zero_terminated = matches.get_flag(options::ZERO_TERMINATED);
match matches.get_one::<String>(options::DELIMITER).map(|s| s.as_str()) { match matches.get_one::<String>(options::DELIMITER).map(|s| s.as_str()) {
Some(mut delim) => { Some(_) if whitespace_delimited => {
if whitespace_delimited {
Err("invalid input: Only one of --delimiter (-d) or -w option can be specified".into()) Err("invalid input: Only one of --delimiter (-d) or -w option can be specified".into())
} }
else { Some(mut delim) => {
// GNU's `cut` supports `-d=` to set the delimiter to `=`. // GNU's `cut` supports `-d=` to set the delimiter to `=`.
// Clap parsing is limited in this situation, see: // Clap parsing is limited in this situation, see:
// https://github.com/uutils/coreutils/issues/2424#issuecomment-863825242 // https://github.com/uutils/coreutils/issues/2424#issuecomment-863825242
@ -586,7 +585,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
)) ))
} }
} }
}
None => Ok(Mode::Fields( None => Ok(Mode::Fields(
ranges, ranges,
FieldOptions { FieldOptions {