RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #3585 from cakebaker/multiple_tabs

Browse source 
expand: allow multiple "tabs" args
This commit is contained in:
Sylvestre Ledru 2022-06-02 10:08:45 +02:00 • committed by GitHub
commit 68cc9312c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/uu/expand/src/expand.rs
View file

@ -132,8 +132,8 @@ struct Options {
impl Options { impl Options {
fn new(matches: &ArgMatches) -> Self { fn new(matches: &ArgMatches) -> Self {
let (remaining_mode, tabstops) = match matches.value_of(options::TABS) { let (remaining_mode, tabstops) = match matches.values_of(options::TABS) {
Some(s) => tabstops_parse(s), Some(s) => tabstops_parse(&s.collect::<Vec<&str>>().join(",")),
None => (RemainingMode::None, vec![DEFAULT_TABSTOP]), None => (RemainingMode::None, vec![DEFAULT_TABSTOP]),
}; };
@ -195,6 +195,7 @@ pub fn uu_app<'a>() -> Command<'a> {
.short('t') .short('t')
.value_name("N, LIST") .value_name("N, LIST")
.takes_value(true) .takes_value(true)
.multiple_occurrences(true)
.help("have tabs N characters apart, not 8 or use comma separated list of explicit tab positions"), .help("have tabs N characters apart, not 8 or use comma separated list of explicit tab positions"),
) )
.arg( .arg(

9
tests/by-util/test_expand.rs
View file

@ -73,6 +73,15 @@ fn test_tabs_mixed_style_list() {
.stdout_is("a b c d e"); .stdout_is("a b c d e");
} }
#[test]
fn test_multiple_tabs_args() {
new_ucmd!()
.args(&["--tabs=3", "--tabs=6", "--tabs=9"])
.pipe_in("a\tb\tc\td\te")
.succeeds()
.stdout_is("a b c d e");
}
#[test] #[test]
fn test_tabs_empty_string() { fn test_tabs_empty_string() {
new_ucmd!() new_ucmd!()