Skip to content

dircolors: replace if/else chain with match #12822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvestre merged 1 commit into from
Jun 13, 2026
Merged

dircolors: replace if/else chain with match #12822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 34 additions & 35 deletions src/uu/dircolors/src/dircolors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,44 +163,43 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
})?
};

let result;
if files.is_empty() {
writeln!(stdout(), "{}", generate_ls_colors(&out_format, ":"))?;
return Ok(());
} else if files.len() > 1 {
return Err(UUsageError::new(
match files.as_slice() {
[] => {
writeln!(stdout(), "{}", generate_ls_colors(&out_format, ":"))?;
Ok(())
}
[_file_arg, extra, ..] => Err(UUsageError::new(
1,
translate!("dircolors-error-extra-operand", "operand" => files[1].quote()),
));
} else if files[0] == "-" {
let fin = BufReader::new(std::io::stdin());
// For example, for echo "owt 40;33"|dircolors -b -
result = parse(
fin.lines().map_while(Result::ok),
&out_format,
&files[0].to_string_lossy(),
);
} else {
let path = Path::new(&files[0]);
if path.is_dir() {
return Err(USimpleError::new(
2,
translate!("dircolors-error-expected-file-got-directory", "path" => path.quote()),
));
translate!("dircolors-error-extra-operand", "operand" => extra.quote()),
)),
[file_arg] => {
let result = if *file_arg == "-" {
let fin = BufReader::new(std::io::stdin());
// For example, for echo "owt 40;33"|dircolors -b -
parse(fin.lines().map_while(Result::ok), &out_format, "-")
} else {
let path = Path::new(&file_arg);
if path.is_dir() {
return Err(USimpleError::new(
2,
translate!("dircolors-error-expected-file-got-directory", "path" => path.quote()),
));
}
let file = File::open(path)
.map_err(|e| USimpleError::new(1, format!("{}: {e}", path.maybe_quote())))?;
let fin = BufReader::new(file);
parse(
fin.lines().map_while(Result::ok),
&out_format,
&path.to_string_lossy(),
)
};

let string = result.map_err(|s| USimpleError::new(1, s))?;
writeln!(stdout(), "{string}")?;
Ok(())
}
let file = File::open(path)
.map_err(|e| USimpleError::new(1, format!("{}: {e}", path.maybe_quote())))?;
let fin = BufReader::new(file);
result = parse(
fin.lines().map_while(Result::ok),
&out_format,
&path.to_string_lossy(),
);
}

let string = result.map_err(|s| USimpleError::new(1, s))?;
writeln!(stdout(), "{string}")?;
Ok(())
}

pub fn uu_app() -> Command {
Expand Down
Loading