system/coreutils
system/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-09-30 13:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5012 from cakebaker/seq_rename_widths_to_equal_width

Browse source 
seq: rename "--widths" to "--equal-width"
This commit is contained in:
Sylvestre Ledru 2023-06-28 23:24:47 +02:00 committed by GitHub
parent 5ce7ae56b6 c05dbfa3b4
commit 682e0e3750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/uu/seq/src/seq.rs
View file

@ -31,7 +31,7 @@ const USAGE: &str = help_usage!("seq.md");
const OPT_SEPARATOR: &str = "separator";
const OPT_TERMINATOR: &str = "terminator";
const OPT_WIDTHS: &str = "widths";
const OPT_EQUAL_WIDTH: &str = "equal-width";
const OPT_FORMAT: &str = "format";
const ARG_NUMBERS: &str = "numbers";
@ -40,7 +40,7 @@ const ARG_NUMBERS: &str = "numbers";
struct SeqOptions<'a> {
separator: String,
terminator: String,
widths: bool,
equal_width: bool,
format: Option<&'a str>,
}
@ -74,7 +74,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
.map(|s| s.as_str())
.unwrap_or("\n")
.to_string(),
widths: matches.get_flag(OPT_WIDTHS),
equal_width: matches.get_flag(OPT_EQUAL_WIDTH),
format: matches.get_one::<String>(OPT_FORMAT).map(|s| s.as_str()),
};
@ -123,7 +123,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
(first, increment, last),
&options.separator,
&options.terminator,
options.widths,
options.equal_width,
padding,
options.format,
)
@ -137,7 +137,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
largest_dec,
&options.separator,
&options.terminator,
options.widths,
options.equal_width,
padding,
options.format,
),
@ -170,9 +170,9 @@ pub fn uu_app() -> Command {
.help("Terminator character (defaults to \\n)"),
)
.arg(
Arg::new(OPT_WIDTHS)
Arg::new(OPT_EQUAL_WIDTH)
.short('w')
.long("widths")
.long("equal-width")
.help("Equalize widths of all numbers by padding with zeros")
.action(ArgAction::SetTrue),
)

11
tests/by-util/test_seq.rs
View file

@ -208,10 +208,13 @@ fn test_separator_and_terminator() {
#[test]
fn test_equalize_widths() {
new_ucmd!()
.args(&["-w", "5", "10"])
.run()
.stdout_is("05\n06\n07\n08\n09\n10\n");
let args = ["-w", "--equal-width"];
for arg in args {
new_ucmd!()
.args(&[arg, "5", "10"])
.run()
.stdout_is("05\n06\n07\n08\n09\n10\n");
}
}
#[test]