summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Gallant <jamslam@gmail.com>2016-11-19 20:15:41 -0500
committerAndrew Gallant <jamslam@gmail.com>2016-11-19 20:15:41 -0500
commit03f76053228b646a7febed3853ab28f42b83b1ad (patch)
tree6fa5ce01f818d683e732bbd2268a89223b27e3f5 /src
parent61663e230782ecee05cde8d9cc44d34d6eb9c8c7 (diff)
Rename --files-without-matches to --files-without-match.
This is to be consistent with grep.
Diffstat (limited to 'src')
-rw-r--r--src/app.rs4
-rw-r--r--src/args.rs2
-rw-r--r--src/search_stream.rs4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/app.rs b/src/app.rs
index a549bc59..33dfb271 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -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"))
@@ -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.",
diff --git a/src/args.rs b/src/args.rs
index 58cdee61..836b2819 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -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"),
diff --git a/src/search_stream.rs b/src/search_stream.rs
index b92fa806..d4478170 100644
--- a/src/search_stream.rs
+++ b/src/search_stream.rs
@@ -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