From 4bed10a26aa01bb5f2fa33ad4f815137d1aa274b Mon Sep 17 00:00:00 2001 From: Miles Liu Date: Tue, 21 Mar 2023 13:46:00 +0800 Subject: [PATCH 1/3] hashsum: move help strings to markdown file --- src/uu/hashsum/hashsum.md | 7 +++++++ src/uu/hashsum/src/hashsum.rs | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/uu/hashsum/hashsum.md diff --git a/src/uu/hashsum/hashsum.md b/src/uu/hashsum/hashsum.md new file mode 100644 index 000000000..a632eedf3 --- /dev/null +++ b/src/uu/hashsum/hashsum.md @@ -0,0 +1,7 @@ +# hashsum + +``` +hashsum [OPTIONS] [FILE]... +``` + +Compute and check message digests. diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs index c49c530e4..2835fce5a 100644 --- a/src/uu/hashsum/src/hashsum.rs +++ b/src/uu/hashsum/src/hashsum.rs @@ -24,6 +24,9 @@ use std::iter; use std::num::ParseIntError; use std::path::Path; use uucore::error::{FromIo, UError, UResult}; +use uucore::format_usage; +use uucore::help_about; +use uucore::help_usage; use uucore::sum::{ Blake2b, Blake3, Digest, DigestWriter, Md5, Sha1, Sha224, Sha256, Sha384, Sha3_224, Sha3_256, Sha3_384, Sha3_512, Sha512, Shake128, Shake256, @@ -31,6 +34,8 @@ use uucore::sum::{ use uucore::{crash, display::Quotable, show_warning}; const NAME: &str = "hashsum"; +const ABOUT: &str = help_about!("hashsum.md"); +const USAGE: &str = help_usage!("hashsum.md"); struct Options { algoname: &'static str, @@ -298,7 +303,8 @@ pub fn uu_app_common() -> Command { const TEXT_HELP: &str = "read in text mode (default)"; Command::new(uucore::util_name()) .version(crate_version!()) - .about("Compute and check message digests.") + .about(ABOUT) + .override_usage(format_usage(USAGE)) .infer_long_args(true) .arg( Arg::new("binary") From 62e5c5a7554d94e03270addd7f3a4020244dbfe1 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 21 Mar 2023 08:07:24 +0100 Subject: [PATCH 2/3] hashsum: merge imports --- src/uu/hashsum/src/hashsum.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs index 2835fce5a..b648b0598 100644 --- a/src/uu/hashsum/src/hashsum.rs +++ b/src/uu/hashsum/src/hashsum.rs @@ -24,9 +24,7 @@ use std::iter; use std::num::ParseIntError; use std::path::Path; use uucore::error::{FromIo, UError, UResult}; -use uucore::format_usage; -use uucore::help_about; -use uucore::help_usage; +use uucore::{format_usage, help_about, help_usage}; use uucore::sum::{ Blake2b, Blake3, Digest, DigestWriter, Md5, Sha1, Sha224, Sha256, Sha384, Sha3_224, Sha3_256, Sha3_384, Sha3_512, Sha512, Shake128, Shake256, From 23e67adfd3683f477efb9a37ca008d8ed6343ee0 Mon Sep 17 00:00:00 2001 From: Miles Liu Date: Tue, 21 Mar 2023 15:44:03 +0800 Subject: [PATCH 3/3] hashsum: fix style violation --- src/uu/hashsum/src/hashsum.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs index b648b0598..d7e55e567 100644 --- a/src/uu/hashsum/src/hashsum.rs +++ b/src/uu/hashsum/src/hashsum.rs @@ -24,12 +24,12 @@ use std::iter; use std::num::ParseIntError; use std::path::Path; use uucore::error::{FromIo, UError, UResult}; -use uucore::{format_usage, help_about, help_usage}; use uucore::sum::{ Blake2b, Blake3, Digest, DigestWriter, Md5, Sha1, Sha224, Sha256, Sha384, Sha3_224, Sha3_256, Sha3_384, Sha3_512, Sha512, Shake128, Shake256, }; use uucore::{crash, display::Quotable, show_warning}; +use uucore::{format_usage, help_about, help_usage}; const NAME: &str = "hashsum"; const ABOUT: &str = help_about!("hashsum.md");