Merge pull request #3081 from HeroicKatora/main

Discuss seq parsing
This commit is contained in:
Terts Diepraam 2022-03-03 22:50:32 +01:00 committed by GitHub
commit 618a268f61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 5 deletions

View file

@ -144,7 +144,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
pub fn uu_app<'a>() -> App<'a> {
App::new(uucore::util_name())
.setting(AppSettings::TrailingVarArg)
.setting(AppSettings::AllowHyphenValues)
.setting(AppSettings::AllowNegativeNumbers)
.setting(AppSettings::InferLongArgs)
.version(crate_version!())
.about(ABOUT)

View file

@ -20,14 +20,14 @@ fn test_hex_rejects_sign_after_identifier() {
.args(&["-0x-123ABC"])
.fails()
.no_stdout()
.stderr_contains("invalid floating point argument: '-0x-123ABC'")
.stderr_contains("for more information.");
.stderr_contains("which wasn't expected, or isn't valid in this context")
.stderr_contains("For more information try --help");
new_ucmd!()
.args(&["-0x+123ABC"])
.fails()
.no_stdout()
.stderr_contains("invalid floating point argument: '-0x+123ABC'")
.stderr_contains("for more information.");
.stderr_contains("which wasn't expected, or isn't valid in this context")
.stderr_contains("For more information try --help");
}
#[test]
@ -81,6 +81,33 @@ fn test_rejects_non_floats() {
.usage_error("invalid floating point argument: 'foo'");
}
#[test]
fn test_accepts_option_argument_directly() {
new_ucmd!()
.arg("-s,")
.arg("2")
.succeeds()
.stdout_is("1,2\n");
}
#[test]
fn test_option_with_detected_negative_argument() {
new_ucmd!()
.arg("-s,")
.args(&["-1", "2"])
.succeeds()
.stdout_is("-1,0,1,2\n");
}
#[test]
fn test_negative_number_as_separator() {
new_ucmd!()
.arg("-s")
.args(&["-1", "2"])
.succeeds()
.stdout_is("1-12\n");
}
#[test]
fn test_invalid_float() {
new_ucmd!()