Merge pull request #626 from wcampbell0x2a/use-clap-cargo-styles

wcampbell0x2a · Nov 9, 2024 · edabc62 · edabc62
2 parents 8d90b8c + 4b5b990
commit edabc62
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/backhand-cli/Cargo.toml b/backhand-cli/Cargo.toml
@@ -23,6 +23,7 @@ rayon = "1.10.0"
 backhand = { path = "../backhand", default-features = false, version = "0.18.0" }
 tracing = "0.1.40"
 color-print = "0.3.6"
+clap-cargo = "0.14.1"
 
 [lib]
 bench = false

diff --git a/backhand-cli/src/bin/add.rs b/backhand-cli/src/bin/add.rs
@@ -5,7 +5,7 @@ use std::path::PathBuf;
 use std::process::ExitCode;
 
 use backhand::{FilesystemReader, FilesystemWriter, NodeHeader};
-use backhand_cli::{after_help, styles};
+use backhand_cli::after_help;
 use clap::Parser;
 use tracing::{error, info};
 use tracing_subscriber::EnvFilter;
@@ -22,7 +22,7 @@ static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
           name = "add-backhand",
           after_help = after_help(false),
           max_term_width = 98,
-          styles = styles(),
+          styles = clap_cargo::style::CLAP_STYLING,
 )]
 struct Args {
     /// Squashfs input image

diff --git a/backhand-cli/src/bin/replace.rs b/backhand-cli/src/bin/replace.rs
@@ -4,7 +4,7 @@ use std::path::PathBuf;
 use std::process::ExitCode;
 
 use backhand::{FilesystemReader, FilesystemWriter};
-use backhand_cli::{after_help, styles};
+use backhand_cli::after_help;
 use clap::Parser;
 use tracing::error;
 use tracing_subscriber::EnvFilter;
@@ -21,7 +21,7 @@ static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
           name = "replace-backhand",
           after_help = after_help(false),
           max_term_width = 98,
-          styles = styles(),
+          styles = clap_cargo::style::CLAP_STYLING,
 )]
 struct Args {
     /// Squashfs input image

diff --git a/backhand-cli/src/bin/unsquashfs.rs b/backhand-cli/src/bin/unsquashfs.rs
@@ -12,7 +12,7 @@ use backhand::{
     BufReadSeek, FilesystemReader, InnerNode, Node, NodeHeader, Squashfs, SquashfsBlockDevice,
     SquashfsCharacterDevice, SquashfsDir, SquashfsFileReader, SquashfsSymlink, DEFAULT_BLOCK_SIZE,
 };
-use backhand_cli::{after_help, styles};
+use backhand_cli::after_help;
 use clap::builder::PossibleValuesParser;
 use clap::{CommandFactory, Parser};
 use clap_complete::{generate, Shell};
@@ -84,7 +84,7 @@ pub fn failed(pb: &ProgressBar, s: &str) {
           name = "unsquashfs-backhand",
           after_help = after_help(true),
           max_term_width = 98,
-          styles = styles(),
+          styles = clap_cargo::style::CLAP_STYLING,
 )]
 struct Args {
     /// Squashfs file