Robot
/
fd
mirror of https://github.com/sharkdp/fd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Making `-1` conflict with `--exec` and making `max-results` override `-1`

This commit is contained in:
Eden Mikitas 2023-10-05 15:10:37 +03:00
parent 93cdb2628e
commit dea9110b90
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cli.rs
View File

@ -26,7 +26,7 @@ use crate::filter::SizeFilter;
max_term_width = 98, max_term_width = 98,
args_override_self = true, args_override_self = true,
group(ArgGroup::new("execs").args(&["exec", "exec_batch", "list_details"]).conflicts_with_all(&[ group(ArgGroup::new("execs").args(&["exec", "exec_batch", "list_details"]).conflicts_with_all(&[
"max_results", "has_results", "count"])), "max_results", "has_results", "count", "max_one_result"])),
)] )]
pub struct Opts { pub struct Opts {
/// Include hidden directories and files in the search results (default: /// Include hidden directories and files in the search results (default:
@ -505,6 +505,7 @@ pub struct Opts {
long, long,
value_name = "count", value_name = "count",
hide_short_help = true, hide_short_help = true,
overrides_with("max_one_result"),
help = "Limit the number of search results", help = "Limit the number of search results",
long_help long_help
)] )]

5
tests/tests.rs
View File

@ -2384,6 +2384,11 @@ fn test_max_results() {
}; };
assert_just_one_result_with_option("--max-results=1"); assert_just_one_result_with_option("--max-results=1");
assert_just_one_result_with_option("-1"); assert_just_one_result_with_option("-1");
// check that --max-results & -1 conflic with --exec
te.assert_failure(&["thing", "--max-results=0", "--exec=cat"]);
te.assert_failure(&["thing", "-1", "--exec=cat"]);
te.assert_failure(&["thing", "--max-results=1", "-1", "--exec=cat"]);
} }
/// Filenames with non-utf8 paths are passed to the executed program unchanged /// Filenames with non-utf8 paths are passed to the executed program unchanged