RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

echo: Some minor changes to options (#1960)

Browse source
This commit is contained in:
Alessandro Stoltenberg 2021-03-31 22:27:24 +02:00 • committed by GitHub
parent e958864bd9
commit 7669a4387a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/uu/echo/src/echo.rs
View file

@ -14,10 +14,10 @@ use std::io::{self, Write};
use std::iter::Peekable; use std::iter::Peekable;
use std::str::Chars; use std::str::Chars;
static NAME: &str = "echo"; const NAME: &str = "echo";
static USAGE: &str = "[OPTIONS]... [STRING]..."; const SUMMARY: &str = "display a line of text";
static SUMMARY: &str = "display a line of text"; const USAGE: &str = "[OPTIONS]... [STRING]...";
static AFTER_HELP: &str = r#" const AFTER_HELP: &str = r#"
Echo the STRING(s) to standard output. Echo the STRING(s) to standard output.
If -e is in effect, the following sequences are recognized: If -e is in effect, the following sequences are recognized:
@ -36,11 +36,12 @@ static AFTER_HELP: &str = r#"
\\xHH byte with hexadecimal value HH (1 to 2 digits) \\xHH byte with hexadecimal value HH (1 to 2 digits)
"#; "#;
mod options { mod options {
pub static STRING: &str = "STRING"; pub const STRING: &str = "STRING";
pub static NO_NEWLINE: &str = "no_newline"; pub const NO_NEWLINE: &str = "no_newline";
pub static ENABLE_BACKSLASH_ESCAPE: &str = "enable_backslash_escape"; pub const ENABLE_BACKSLASH_ESCAPE: &str = "enable_backslash_escape";
pub static DISABLE_BACKSLASH_ESCAPE: &str = "disable_backslash_escape"; pub const DISABLE_BACKSLASH_ESCAPE: &str = "disable_backslash_escape";
} }
fn parse_code( fn parse_code(
@ -113,8 +114,6 @@ fn print_escaped(input: &str, mut output: impl Write) -> io::Result<bool> {
} }
pub fn uumain(args: impl uucore::Args) -> i32 { pub fn uumain(args: impl uucore::Args) -> i32 {
let args = args.collect_str();
let matches = App::new(executable!()) let matches = App::new(executable!())
.name(NAME) .name(NAME)
// TrailingVarArg specifies the final positional argument is a VarArg // TrailingVarArg specifies the final positional argument is a VarArg
@ -123,9 +122,9 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
.setting(clap::AppSettings::TrailingVarArg) .setting(clap::AppSettings::TrailingVarArg)
.setting(clap::AppSettings::AllowLeadingHyphen) .setting(clap::AppSettings::AllowLeadingHyphen)
.version(crate_version!()) .version(crate_version!())
.usage(USAGE)
.about(SUMMARY) .about(SUMMARY)
.after_help(AFTER_HELP) .after_help(AFTER_HELP)
.usage(USAGE)
.arg( .arg(
Arg::with_name(options::NO_NEWLINE) Arg::with_name(options::NO_NEWLINE)
.short("n") .short("n")
@ -149,7 +148,6 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
) )
.arg( .arg(
Arg::with_name(options::STRING) Arg::with_name(options::STRING)
.hidden(true)
.multiple(true) .multiple(true)
.allow_hyphen_values(true), .allow_hyphen_values(true),
) )