Merge pull request sharkdp#1398 from tmccombs/clap-update

Clap update
tmccombs · Oct 18, 2023 · b8e7cbd · b8e7cbd
2 parents 19832fc + fa01a28
commit b8e7cbd
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ## Bugfixes
 
+- `-1` properly conflicts with the exec family of options.
+- `--max-results` overrides `-1`
+- `--quiet` properly conflicts with the exec family of options. This used to be the case, but broke during the switch to clap-derive
+
 ## Changes
 
 ## Other

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -51,8 +51,8 @@ clap_complete = {version = "4.4.1", optional = true}
 faccess = "0.2.4"
 
 [dependencies.clap]
-version = "4.1.1"
-features = ["suggestions", "color", "wrap_help", "cargo", "unstable-grouped", "derive"]
+version = "4.4.6"
+features = ["suggestions", "color", "wrap_help", "cargo", "derive"]
 
 [dependencies.chrono]
 version = "0.4.28"

diff --git a/src/cli.rs b/src/cli.rs
@@ -26,7 +26,7 @@ use crate::filter::SizeFilter;
     max_term_width = 98,
     args_override_self = true,
     group(ArgGroup::new("execs").args(&["exec", "exec_batch", "list_details"]).conflicts_with_all(&[
-            "max_results", "has_results", "count", "max_one_result"])),
+            "max_results", "quiet", "max_one_result"])),
 )]
 pub struct Opts {
     /// Include hidden directories and files in the search results (default: