From 74ed7374606bbf21f2ff6fa9b9bbee6d53e209fb Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Thu, 12 Jan 2023 15:21:11 +0100 Subject: [PATCH] remove NAME constants --- src/uu/cat/src/cat.rs | 2 -- src/uu/cksum/src/cksum.rs | 2 -- src/uu/cut/src/cut.rs | 2 -- src/uu/echo/src/echo.rs | 2 -- src/uu/fold/src/fold.rs | 2 -- src/uu/mkfifo/src/mkfifo.rs | 2 -- src/uu/nl/src/nl.rs | 2 -- src/uu/ptx/src/ptx.rs | 2 -- src/uu/shuf/src/shuf.rs | 2 -- src/uu/stty/src/stty.rs | 2 -- src/uu/sum/src/sum.rs | 2 -- src/uu/tac/src/tac.rs | 2 -- src/uu/unexpand/src/unexpand.rs | 2 -- 13 files changed, 26 deletions(-) diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs index 3200bdf4e..d29ed3c30 100644 --- a/src/uu/cat/src/cat.rs +++ b/src/uu/cat/src/cat.rs @@ -35,7 +35,6 @@ use std::os::unix::fs::FileTypeExt; use std::os::unix::net::UnixStream; use uucore::format_usage; -static NAME: &str = "cat"; static USAGE: &str = "{} [OPTION]... [FILE]..."; static ABOUT: &str = "Concatenate FILE(s), or standard input, to standard output With no FILE, or when FILE is -, read standard input."; @@ -236,7 +235,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) diff --git a/src/uu/cksum/src/cksum.rs b/src/uu/cksum/src/cksum.rs index 8bbcfd836..fc7f901c9 100644 --- a/src/uu/cksum/src/cksum.rs +++ b/src/uu/cksum/src/cksum.rs @@ -18,7 +18,6 @@ use uucore::{format_usage, show}; const CRC_TABLE_LEN: usize = 256; const CRC_TABLE: [u32; CRC_TABLE_LEN] = generate_crc_table(); -const NAME: &str = "cksum"; const USAGE: &str = "{} [OPTIONS] [FILE]..."; const ABOUT: &str = "Print CRC and size for each file"; @@ -139,7 +138,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs index a9a261882..6b4904533 100644 --- a/src/uu/cut/src/cut.rs +++ b/src/uu/cut/src/cut.rs @@ -23,7 +23,6 @@ use uucore::{format_usage, show, show_error, show_if_err}; mod searcher; mod whitespace_searcher; -static NAME: &str = "cut"; static USAGE: &str = "{} [-d|-w] [-s] [-z] [--output-delimiter] ((-f|-b|-c) {{sequence}}) {{sourcefile}}+"; static ABOUT: &str = @@ -654,7 +653,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) diff --git a/src/uu/echo/src/echo.rs b/src/uu/echo/src/echo.rs index 3a397d6af..cae9e6225 100644 --- a/src/uu/echo/src/echo.rs +++ b/src/uu/echo/src/echo.rs @@ -13,7 +13,6 @@ use std::str::Chars; use uucore::error::{FromIo, UResult}; use uucore::format_usage; -const NAME: &str = "echo"; const ABOUT: &str = "display a line of text"; const USAGE: &str = "{} [OPTIONS]... [STRING]..."; const AFTER_HELP: &str = r#" @@ -129,7 +128,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) // TrailingVarArg specifies the final positional argument is a VarArg // and it doesn't attempts the parse any further args. // Final argument must have multiple(true) or the usage string equivalent. diff --git a/src/uu/fold/src/fold.rs b/src/uu/fold/src/fold.rs index 77ec359ef..3b27549b1 100644 --- a/src/uu/fold/src/fold.rs +++ b/src/uu/fold/src/fold.rs @@ -17,7 +17,6 @@ use uucore::format_usage; const TAB_WIDTH: usize = 8; -static NAME: &str = "fold"; static USAGE: &str = "{} [OPTION]... [FILE]..."; static ABOUT: &str = "Writes each file (or standard input if no files are given) to standard output whilst breaking long lines"; @@ -63,7 +62,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) diff --git a/src/uu/mkfifo/src/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs index 14b8d9685..24fbba679 100644 --- a/src/uu/mkfifo/src/mkfifo.rs +++ b/src/uu/mkfifo/src/mkfifo.rs @@ -12,7 +12,6 @@ use uucore::display::Quotable; use uucore::error::{UResult, USimpleError}; use uucore::{format_usage, show}; -static NAME: &str = "mkfifo"; static USAGE: &str = "{} [OPTION]... NAME..."; static ABOUT: &str = "Create a FIFO with the given name."; @@ -67,7 +66,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) diff --git a/src/uu/nl/src/nl.rs b/src/uu/nl/src/nl.rs index 451f77048..a93dc12ef 100644 --- a/src/uu/nl/src/nl.rs +++ b/src/uu/nl/src/nl.rs @@ -18,7 +18,6 @@ use uucore::format_usage; mod helper; -static NAME: &str = "nl"; static ABOUT: &str = "number lines of files"; static USAGE: &str = "{} [OPTION]... [FILE]..."; @@ -141,7 +140,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .about(ABOUT) .version(crate_version!()) .override_usage(format_usage(USAGE)) diff --git a/src/uu/ptx/src/ptx.rs b/src/uu/ptx/src/ptx.rs index 965b4ba8e..8c9d40bd0 100644 --- a/src/uu/ptx/src/ptx.rs +++ b/src/uu/ptx/src/ptx.rs @@ -21,7 +21,6 @@ use uucore::display::Quotable; use uucore::error::{FromIo, UError, UResult}; use uucore::format_usage; -static NAME: &str = "ptx"; const USAGE: &str = "\ {} [OPTION]... [INPUT]... {} -G [OPTION]... [INPUT [OUTPUT]]"; @@ -747,7 +746,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .about(ABOUT) .version(crate_version!()) .override_usage(format_usage(USAGE)) diff --git a/src/uu/shuf/src/shuf.rs b/src/uu/shuf/src/shuf.rs index f78f8c425..b9e296686 100644 --- a/src/uu/shuf/src/shuf.rs +++ b/src/uu/shuf/src/shuf.rs @@ -25,7 +25,6 @@ enum Mode { InputRange((usize, usize)), } -static NAME: &str = "shuf"; static USAGE: &str = "\ {} [OPTION]... [FILE] {} -e [OPTION]... [ARG]... @@ -127,7 +126,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .about(ABOUT) .version(crate_version!()) .override_usage(format_usage(USAGE)) diff --git a/src/uu/stty/src/stty.rs b/src/uu/stty/src/stty.rs index ed0f22552..3c3fcaf63 100644 --- a/src/uu/stty/src/stty.rs +++ b/src/uu/stty/src/stty.rs @@ -30,7 +30,6 @@ use uucore::format_usage; use flags::BAUD_RATES; use flags::{CONTROL_FLAGS, INPUT_FLAGS, LOCAL_FLAGS, OUTPUT_FLAGS}; -const NAME: &str = "stty"; const USAGE: &str = "\ {} [-F DEVICE | --file=DEVICE] [SETTING]... {} [-F DEVICE | --file=DEVICE] [-a|--all] @@ -324,7 +323,6 @@ fn apply_flag( pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(SUMMARY) diff --git a/src/uu/sum/src/sum.rs b/src/uu/sum/src/sum.rs index 8f20054e4..685ac756d 100644 --- a/src/uu/sum/src/sum.rs +++ b/src/uu/sum/src/sum.rs @@ -15,7 +15,6 @@ use uucore::display::Quotable; use uucore::error::{FromIo, UResult, USimpleError}; use uucore::{format_usage, show}; -static NAME: &str = "sum"; static USAGE: &str = "{} [OPTION]... [FILE]..."; static ABOUT: &str = "Checksum and count the blocks in a file.\n\n\ With no FILE, or when FILE is -, read standard input."; @@ -148,7 +147,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) diff --git a/src/uu/tac/src/tac.rs b/src/uu/tac/src/tac.rs index 7a448ca3d..b0d79e6da 100644 --- a/src/uu/tac/src/tac.rs +++ b/src/uu/tac/src/tac.rs @@ -23,7 +23,6 @@ use uucore::{format_usage, show}; use crate::error::TacError; -static NAME: &str = "tac"; static USAGE: &str = "{} [OPTION]... [FILE]..."; static ABOUT: &str = "Write each file to standard output, last line first."; @@ -62,7 +61,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT) diff --git a/src/uu/unexpand/src/unexpand.rs b/src/uu/unexpand/src/unexpand.rs index d9dcc92e0..030e090fc 100644 --- a/src/uu/unexpand/src/unexpand.rs +++ b/src/uu/unexpand/src/unexpand.rs @@ -21,7 +21,6 @@ use uucore::display::Quotable; use uucore::error::{FromIo, UError, UResult}; use uucore::{crash, crash_if_err, format_usage}; -static NAME: &str = "unexpand"; static USAGE: &str = "{} [OPTION]... [FILE]..."; static ABOUT: &str = "Convert blanks in each FILE to tabs, writing to standard output.\n\n\ With no FILE, or when FILE is -, read standard input."; @@ -172,7 +171,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .name(NAME) .version(crate_version!()) .override_usage(format_usage(USAGE)) .about(ABOUT)