1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 19:47:45 +00:00

Merge pull request #2923 from jfinkels/seq-error-zero-increment-value

seq: correct error message for zero increment
This commit is contained in:
Sylvestre Ledru 2022-01-29 01:25:57 +01:00 committed by GitHub
commit f1d72018d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions

View file

@ -40,11 +40,11 @@ impl SeqError {
fn argtype(&self) -> &str {
match self {
SeqError::ParseError(_, e) => match e {
ParseNumberError::Float => "floating point",
ParseNumberError::Nan => "'not-a-number'",
ParseNumberError::Hex => "hexadecimal",
ParseNumberError::Float => "floating point argument",
ParseNumberError::Nan => "'not-a-number' argument",
ParseNumberError::Hex => "hexadecimal argument",
},
SeqError::ZeroIncrement(_) => "Zero increment",
SeqError::ZeroIncrement(_) => "Zero increment value",
}
}
}
@ -61,7 +61,7 @@ impl Display for SeqError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(
f,
"invalid {} argument: {}\nTry '{} --help' for more information.",
"invalid {}: {}\nTry '{} --help' for more information.",
self.argtype(),
self.arg().quote(),
uucore::execution_phrase(),

View file

@ -701,3 +701,13 @@ fn test_format_option() {
.succeeds()
.stdout_only("0.00\n0.10\n0.20\n0.30\n0.40\n0.50\n");
}
#[test]
fn test_invalid_zero_increment_value() {
new_ucmd!()
.args(&["0", "0", "1"])
.fails()
.no_stdout()
.stderr_contains("invalid Zero increment value: '0'")
.stderr_contains("for more information.");
}