Repository navigation
expand, unexpand: preserve bare - as stdin - #15716
Open
qiyuhuating wants to merge 5 commits into
Open
qiyuhuating wants to merge 5 commits into
qiyuhuating wants to merge 5 commits into
Conversation
oech3
reviewed
Oct 24, 2026
| if let Some(arg) = arg.to_str() { | ||
| if arg.starts_with('-') && arg[1..].chars().all(is_digit_or_comma) { | ||
| if arg.len() > 1 | ||
| && arg.starts_with('-') |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
qiyuhuating
force-pushed
the
fix/expand-unexpand-bare-stdin
branch
from
October 24, 2026 14:25
28855ba to
0bca20e
Compare
sylvestre
reviewed
Oct 25, 2026
| #[test] | ||
| fn test_bare_dash_does_not_force_first_only() { | ||
| new_ucmd!() | ||
| .args(&["-t", "3", "-"]) |
Contributor
There was a problem hiding this comment.
could you please also add --first-only -? it was failing with "cannot be used multiple times" in the issue
Author
|
Thanks @oech3 and @sylvestre for the reviews. I've updated both Both suggestions are addressed now. Thanks again! |
This branch has not been deployed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #15658.
expand_shortcuts()handles obsolete-Ntab-stop syntax before clap sees the operands. A bare-also matched that check because the part after-is empty andIterator::all()returns true for an empty iterator.For
expand, this removes the stdin operand from a multi-file command. Forunexpand, it additionally marks a shortcut as present and appends--first-only, changing-t N -behavior.Require at least one character after the leading
-before recognizing an obsolete tab-stop shortcut. A bare-therefore reaches clap as the normal stdin file operand.Tests cover stdin before another FILE for both utilities and ensure
unexpand -t 3 -does not accidentally enable--first-only.This is independent of #14291, which handles hyphen-leading values passed to
-t; a bare-in normal operand position remains a separate case.