Skip to content

Commit

Permalink
Rename --files-without-matches to --files-without-match.
Browse files Browse the repository at this point in the history
This is to be consistent with grep.
  • Loading branch information
BurntSushi committed Nov 20, 2016
1 parent 61663e2 commit 03f7605
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion doc/rg.1
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Only show path of each file with matches.
.RS
.RE
.TP
.B \-\-files\-without\-matches
.B \-\-files\-without\-match
Only show path of each file with no matches.
.RS
.RE
Expand Down
2 changes: 1 addition & 1 deletion doc/rg.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Project home page: https://github.com/BurntSushi/ripgrep
-l, --files-with-matches
: Only show path of each file with matches.

--files-without-matches
--files-without-match
: Only show path of each file with no matches.

-H, --with-filename
Expand Down
4 changes: 2 additions & 2 deletions src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ fn app<F>(next_line_help: bool, doc: F) -> App<'static, 'static>
.value_name("FILE").takes_value(true)
.multiple(true).number_of_values(1))
.arg(flag("files-with-matches").short("l"))
.arg(flag("files-without-matches"))
.arg(flag("files-without-match"))
.arg(flag("with-filename").short("H"))
.arg(flag("no-filename"))
.arg(flag("heading"))
Expand Down Expand Up @@ -305,7 +305,7 @@ lazy_static! {
lines, and the newline is not counted as part of the pattern.");
doc!(h, "files-with-matches",
"Only show the path of each file with at least one match.");
doc!(h, "files-without-matches",
doc!(h, "files-without-match",
"Only show the path of each file that contains zero matches.");
doc!(h, "with-filename",
"Show file name for each match.",
Expand Down
2 changes: 1 addition & 1 deletion src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ impl<'a> ArgMatches<'a> {
context_separator: self.context_separator(),
count: self.is_present("count"),
files_with_matches: self.is_present("files-with-matches"),
files_without_matches: self.is_present("files-without-matches"),
files_without_matches: self.is_present("files-without-match"),
eol: b'\n',
files: self.is_present("files"),
follow: self.is_present("follow"),
Expand Down
4 changes: 2 additions & 2 deletions src/search_stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@ impl Default for Options {

impl Options {
/// Several options (--quiet, --count, --files-with-matches,
/// --files-without-matches) imply that we shouldn't ever display matches.
/// --files-without-match) imply that we shouldn't ever display matches.
pub fn skip_matches(&self) -> bool {
self.count || self.files_with_matches || self.files_without_matches
|| self.quiet
}

/// Some options (--quiet, --files-with-matches, --files-without-matches)
/// Some options (--quiet, --files-with-matches, --files-without-match)
/// imply that we can stop searching after the first match.
pub fn stop_after_first_match(&self) -> bool {
self.files_with_matches || self.files_without_matches || self.quiet
Expand Down
7 changes: 4 additions & 3 deletions tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,10 @@ sherlock!(files_with_matches, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| {
assert_eq!(lines, expected);
});

sherlock!(files_without_matches, "Sherlock", ".", |wd: WorkDir, mut cmd: Command| {
sherlock!(files_without_matches, "Sherlock", ".",
|wd: WorkDir, mut cmd: Command| {
wd.create("file.py", "foo");
cmd.arg("--files-without-matches");
cmd.arg("--files-without-match");
let lines: String = wd.stdout(&mut cmd);
let expected = "file.py\n";
assert_eq!(lines, expected);
Expand Down Expand Up @@ -1070,7 +1071,7 @@ sherlock!(feature_89_files_with_matches, "Sherlock", ".",
sherlock!(feature_89_files_without_matches, "Sherlock", ".",
|wd: WorkDir, mut cmd: Command| {
wd.create("file.py", "foo");
cmd.arg("--null").arg("--files-without-matches");
cmd.arg("--null").arg("--files-without-match");

let lines: String = wd.stdout(&mut cmd);
assert_eq!(lines, "file.py\x00");
Expand Down

0 comments on commit 03f7605

Please sign in to comment.