From 20b1f11daa7a420bb40c5d1c48a25a4fa91a5b6d Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 12 Jul 2023 15:25:02 +0200 Subject: [PATCH] nl: add test for "--number-separator" and replace "match" with "if let" --- src/uu/nl/src/helper.rs | 7 ++----- tests/by-util/test_nl.rs | 11 +++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/uu/nl/src/helper.rs b/src/uu/nl/src/helper.rs index 1c4e3386e..341f116c3 100644 --- a/src/uu/nl/src/helper.rs +++ b/src/uu/nl/src/helper.rs @@ -30,11 +30,8 @@ pub fn parse_options(settings: &mut crate::Settings, opts: &clap::ArgMatches) -> // This vector holds error messages encountered. let mut errs: Vec = vec![]; settings.renumber = opts.get_flag(options::NO_RENUMBER); - match opts.get_one::(options::NUMBER_SEPARATOR) { - None => {} - Some(val) => { - settings.number_separator = val.to_owned(); - } + if let Some(val) = opts.get_one::(options::NUMBER_SEPARATOR) { + settings.number_separator = val.to_owned(); } settings.number_format = opts .get_one::(options::NUMBER_FORMAT) diff --git a/tests/by-util/test_nl.rs b/tests/by-util/test_nl.rs index db8ed051e..f75f3f483 100644 --- a/tests/by-util/test_nl.rs +++ b/tests/by-util/test_nl.rs @@ -156,3 +156,14 @@ fn test_invalid_number_width() { .stderr_contains("invalid value 'invalid'"); } } + +#[test] +fn test_number_separator() { + for arg in ["-s:-:", "--number-separator=:-:"] { + new_ucmd!() + .arg(arg) + .pipe_in("test") + .succeeds() + .stdout_is(" 1:-:test\n"); + } +}