-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
pr: exit with code 1 if --column argument is zero #11750
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.
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
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
4046fc3
// exit with code 1 if column argument is 0.
Devel08 8924942
add test for zero column argument
Devel08 a4a0c2b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] e4d2275
remove pointless use of format!();
Devel08 0962e40
move code to already existing check
Devel08 7cf5d5c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] e7531e8
Update pr.rs
Devel08 47074e4
Merge branch 'uutils:main' into main
Devel08 3b9a29e
fix stderr and add test for shortcut
Devel08 e49e7c5
return an error if argument is "-0"
Devel08 39ccb3d
add double dash in error message
Devel08 52d9575
add omitted dash in parse_usize error
Devel08 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -475,7 +475,7 @@ fn parse_usize(matches: &ArgMatches, opt: &str) -> Option<Result<usize, PrError> | |
| let i = value_to_parse.0; | ||
| let option = value_to_parse.1; | ||
| i.parse().map_err(|_e| PrError::EncounteredErrors { | ||
| msg: format!("invalid {option} argument {}", i.quote()), | ||
| msg: format!("invalid -{option} argument {}", i.quote()), | ||
| }) | ||
| }; | ||
| matches | ||
|
|
@@ -771,13 +771,23 @@ fn build_options( | |
| }) | ||
| }); | ||
| let start_column_option = match res { | ||
| Some(Ok(0)) => { | ||
| return Err(PrError::EncounteredErrors { | ||
| msg: "invalid --column argument '0'".to_string(), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same |
||
| }); | ||
| } | ||
| Some(res) => Some(res?), | ||
| None => None, | ||
| }; | ||
|
|
||
| // --column has more priority than -column | ||
|
|
||
| let column_option_value = match parse_usize(matches, options::COLUMN) { | ||
| Some(Ok(0)) => { | ||
| return Err(PrError::EncounteredErrors { | ||
| msg: "invalid --column argument '0'".to_string(), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto |
||
| }); | ||
| } | ||
| Some(res) => Some(res?), | ||
| None => start_column_option, | ||
| }; | ||
|
|
||
|
Devel08 marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for a future pr, please use the translate!() macro for translation