mirror of
https://github.com/bootandy/dust.git
synced 2025-12-12 07:40:40 -08:00
Cleanup: Clean previous commit.
Dislike the idea of passing a string into build_cli. By removing a call to default_value we can side-step the problem. Downside is we lose the error log if a user provides a bad depth
This commit is contained in:
3
build.rs
3
build.rs
@@ -6,8 +6,7 @@ include!("src/cli.rs");
|
|||||||
fn main() -> Result<(), Error> {
|
fn main() -> Result<(), Error> {
|
||||||
let outdir = "completions";
|
let outdir = "completions";
|
||||||
let app_name = "dust";
|
let app_name = "dust";
|
||||||
let max_depth = usize::MAX.to_string();
|
let mut cmd = build_cli();
|
||||||
let mut cmd = build_cli(&max_depth);
|
|
||||||
|
|
||||||
generate_to(Bash, &mut cmd, app_name, outdir)?;
|
generate_to(Bash, &mut cmd, app_name, outdir)?;
|
||||||
generate_to(Zsh, &mut cmd, app_name, outdir)?;
|
generate_to(Zsh, &mut cmd, app_name, outdir)?;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use clap::{Arg, Command};
|
use clap::{Arg, Command};
|
||||||
|
|
||||||
pub fn build_cli(max_depth: &str) -> Command {
|
pub fn build_cli() -> Command<'static> {
|
||||||
Command::new("Dust")
|
Command::new("Dust")
|
||||||
.about("Like du but more intuitive")
|
.about("Like du but more intuitive")
|
||||||
.version(env!("CARGO_PKG_VERSION"))
|
.version(env!("CARGO_PKG_VERSION"))
|
||||||
@@ -11,7 +11,6 @@ pub fn build_cli(max_depth: &str) -> Command {
|
|||||||
.long("depth")
|
.long("depth")
|
||||||
.help("Depth to show")
|
.help("Depth to show")
|
||||||
.takes_value(true)
|
.takes_value(true)
|
||||||
.default_value(max_depth)
|
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("number_of_lines")
|
Arg::new("number_of_lines")
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ fn get_regex_value(maybe_value: Option<Values>) -> Vec<Regex> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let options = build_cli(&usize::MAX.to_string()).get_matches();
|
let options = build_cli().get_matches();
|
||||||
|
|
||||||
let config = get_config();
|
let config = get_config();
|
||||||
|
|
||||||
@@ -108,10 +108,7 @@ fn main() {
|
|||||||
.value_of_t("width")
|
.value_of_t("width")
|
||||||
.unwrap_or_else(|_| get_width_of_terminal());
|
.unwrap_or_else(|_| get_width_of_terminal());
|
||||||
|
|
||||||
let depth = options.value_of_t("depth").unwrap_or_else(|_| {
|
let depth = options.value_of_t("depth").unwrap_or(usize::MAX);
|
||||||
eprintln!("Ignoring bad value for depth");
|
|
||||||
usize::MAX
|
|
||||||
});
|
|
||||||
|
|
||||||
// If depth is set, then we set the default number_of_lines to be max
|
// If depth is set, then we set the default number_of_lines to be max
|
||||||
// instead of screen height
|
// instead of screen height
|
||||||
|
|||||||
Reference in New Issue
Block a user