edition: run 'cargo fix --edition --edition-idioms --all'

Author: BurntSushi

crates/cli/src/human.rs

@@ -52,7 +52,7 @@ impl error::Error for ParseSizeError {
 }
 
 impl fmt::Display for ParseSizeError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use self::ParseSizeErrorKind::*;
 
         match self.kind {

crates/cli/src/lib.rs

@@ -158,18 +158,12 @@ error message is crafted that typically tells the user how to fix the problem.
 
 #![deny(missing_docs)]
 
-extern crate atty;
-extern crate bstr;
-extern crate globset;
+use atty;
+
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
 extern crate log;
-extern crate regex;
-extern crate same_file;
-extern crate termcolor;
-#[cfg(windows)]
-extern crate winapi_util;
 
 mod decompress;
 mod escape;

crates/cli/src/pattern.rs

@@ -35,7 +35,7 @@ impl error::Error for InvalidPatternError {
 }
 
 impl fmt::Display for InvalidPatternError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
             "found invalid UTF-8 in pattern at byte offset {}: {} \

crates/cli/src/process.rs

@@ -47,7 +47,7 @@ impl error::Error for CommandError {
 }
 
 impl fmt::Display for CommandError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.kind {
             CommandErrorKind::Io(ref e) => e.fmt(f),
             CommandErrorKind::Stderr(ref bytes) => {

crates/core/args.rs

@@ -1720,7 +1720,7 @@ impl ArgMatches {
         self.0.value_of_os(name)
     }
 
-    fn values_of_os(&self, name: &str) -> Option<clap::OsValues> {
+    fn values_of_os(&self, name: &str) -> Option<clap::OsValues<'_>> {
         self.0.values_of_os(name)
     }
 }

crates/core/logger.rs

@@ -24,13 +24,13 @@ impl Logger {
 }
 
 impl Log for Logger {
-    fn enabled(&self, _: &log::Metadata) -> bool {
+    fn enabled(&self, _: &log::Metadata<'_>) -> bool {
         // We set the log level via log::set_max_level, so we don't need to
         // implement filtering here.
         true
     }
 
-    fn log(&self, record: &log::Record) {
+    fn log(&self, record: &log::Record<'_>) {
         match (record.file(), record.line()) {
             (Some(file), Some(line)) => {
                 eprintln!(

crates/globset/benches/bench.rs

@@ -4,9 +4,9 @@ tool itself, see the benchsuite directory.
 */
 #![feature(test)]
 
-extern crate glob;
-extern crate globset;
-extern crate regex;
+use glob;
+
+
 extern crate test;
 
 use globset::{Candidate, Glob, GlobMatcher, GlobSet, GlobSetBuilder};

crates/globset/src/glob.rs

@@ -98,7 +98,7 @@ impl hash::Hash for Glob {
 }
 
 impl fmt::Display for Glob {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.glob.fmt(f)
     }
 }
@@ -127,7 +127,7 @@ impl GlobMatcher {
     }
 
     /// Tests whether the given path matches this pattern or not.
-    pub fn is_match_candidate(&self, path: &Candidate) -> bool {
+    pub fn is_match_candidate(&self, path: &Candidate<'_>) -> bool {
         self.re.is_match(&path.path)
     }
 
@@ -157,7 +157,7 @@ impl GlobStrategic {
     }
 
     /// Tests whether the given path matches this pattern or not.
-    fn is_match_candidate(&self, candidate: &Candidate) -> bool {
+    fn is_match_candidate(&self, candidate: &Candidate<'_>) -> bool {
         let byte_path = &*candidate.path;
 
         match self.strategy {

crates/globset/src/lib.rs

@@ -103,12 +103,12 @@ or to enable case insensitive matching.
 
 #![deny(missing_docs)]
 
-extern crate aho_corasick;
-extern crate bstr;
-extern crate fnv;
+
+
+use fnv;
 #[macro_use]
 extern crate log;
-extern crate regex;
+use regex;
 
 #[cfg(feature = "serde1")]
 extern crate serde;
@@ -228,7 +228,7 @@ impl ErrorKind {
 }
 
 impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self.glob {
             None => self.kind.fmt(f),
             Some(ref glob) => {
@@ -239,7 +239,7 @@ impl fmt::Display for Error {
 }
 
 impl fmt::Display for ErrorKind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             ErrorKind::InvalidRecursive
             | ErrorKind::UnclosedClass
@@ -317,7 +317,7 @@ impl GlobSet {
     ///
     /// This takes a Candidate as input, which can be used to amortize the
     /// cost of preparing a path for matching.
-    pub fn is_match_candidate(&self, path: &Candidate) -> bool {
+    pub fn is_match_candidate(&self, path: &Candidate<'_>) -> bool {
         if self.is_empty() {
             return false;
         }
@@ -340,7 +340,7 @@ impl GlobSet {
     ///
     /// This takes a Candidate as input, which can be used to amortize the
     /// cost of preparing a path for matching.
-    pub fn matches_candidate(&self, path: &Candidate) -> Vec<usize> {
+    pub fn matches_candidate(&self, path: &Candidate<'_>) -> Vec<usize> {
         let mut into = vec![];
         if self.is_empty() {
             return into;
@@ -374,7 +374,7 @@ impl GlobSet {
     /// cost of preparing a path for matching.
     pub fn matches_candidate_into(
         &self,
-        path: &Candidate,
+        path: &Candidate<'_>,
         into: &mut Vec<usize>,
     ) {
         into.clear();
@@ -543,7 +543,7 @@ enum GlobSetMatchStrategy {
 }
 
 impl GlobSetMatchStrategy {
-    fn is_match(&self, candidate: &Candidate) -> bool {
+    fn is_match(&self, candidate: &Candidate<'_>) -> bool {
         use self::GlobSetMatchStrategy::*;
         match *self {
             Literal(ref s) => s.is_match(candidate),
@@ -556,7 +556,7 @@ impl GlobSetMatchStrategy {
         }
     }
 
-    fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
+    fn matches_into(&self, candidate: &Candidate<'_>, matches: &mut Vec<usize>) {
         use self::GlobSetMatchStrategy::*;
         match *self {
             Literal(ref s) => s.matches_into(candidate, matches),
@@ -582,12 +582,12 @@ impl LiteralStrategy {
         self.0.entry(lit.into_bytes()).or_insert(vec![]).push(global_index);
     }
 
-    fn is_match(&self, candidate: &Candidate) -> bool {
+    fn is_match(&self, candidate: &Candidate<'_>) -> bool {
         self.0.contains_key(candidate.path.as_bytes())
     }
 
     #[inline(never)]
-    fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
+    fn matches_into(&self, candidate: &Candidate<'_>, matches: &mut Vec<usize>) {
         if let Some(hits) = self.0.get(candidate.path.as_bytes()) {
             matches.extend(hits);
         }
@@ -606,15 +606,15 @@ impl BasenameLiteralStrategy {
         self.0.entry(lit.into_bytes()).or_insert(vec![]).push(global_index);
     }
 
-    fn is_match(&self, candidate: &Candidate) -> bool {
+    fn is_match(&self, candidate: &Candidate<'_>) -> bool {
         if candidate.basename.is_empty() {
             return false;
         }
         self.0.contains_key(candidate.basename.as_bytes())
     }
 
     #[inline(never)]
-    fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
+    fn matches_into(&self, candidate: &Candidate<'_>, matches: &mut Vec<usize>) {
         if candidate.basename.is_empty() {
             return;
         }
@@ -636,15 +636,15 @@ impl ExtensionStrategy {
         self.0.entry(ext.into_bytes()).or_insert(vec![]).push(global_index);
     }
 
-    fn is_match(&self, candidate: &Candidate) -> bool {
+    fn is_match(&self, candidate: &Candidate<'_>) -> bool {
         if candidate.ext.is_empty() {
             return false;
         }
         self.0.contains_key(candidate.ext.as_bytes())
     }
 
     #[inline(never)]
-    fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
+    fn matches_into(&self, candidate: &Candidate<'_>, matches: &mut Vec<usize>) {
         if candidate.ext.is_empty() {
             return;
         }
@@ -662,7 +662,7 @@ struct PrefixStrategy {
 }
 
 impl PrefixStrategy {
-    fn is_match(&self, candidate: &Candidate) -> bool {
+    fn is_match(&self, candidate: &Candidate<'_>) -> bool {
         let path = candidate.path_prefix(self.longest);
         for m in self.matcher.find_overlapping_iter(path) {
             if m.start() == 0 {
@@ -672,7 +672,7 @@ impl PrefixStrategy {
         false
     }
 
-    fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
+    fn matches_into(&self, candidate: &Candidate<'_>, matches: &mut Vec<usize>) {
         let path = candidate.path_prefix(self.longest);
         for m in self.matcher.find_overlapping_iter(path) {
             if m.start() == 0 {
@@ -690,7 +690,7 @@ struct SuffixStrategy {
 }
 
 impl SuffixStrategy {
-    fn is_match(&self, candidate: &Candidate) -> bool {
+    fn is_match(&self, candidate: &Candidate<'_>) -> bool {
         let path = candidate.path_suffix(self.longest);
         for m in self.matcher.find_overlapping_iter(path) {
             if m.end() == path.len() {
@@ -700,7 +700,7 @@ impl SuffixStrategy {
         false
     }
 
-    fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
+    fn matches_into(&self, candidate: &Candidate<'_>, matches: &mut Vec<usize>) {
         let path = candidate.path_suffix(self.longest);
         for m in self.matcher.find_overlapping_iter(path) {
             if m.end() == path.len() {
@@ -714,7 +714,7 @@ impl SuffixStrategy {
 struct RequiredExtensionStrategy(HashMap<Vec<u8>, Vec<(usize, Regex)>, Fnv>);
 
 impl RequiredExtensionStrategy {
-    fn is_match(&self, candidate: &Candidate) -> bool {
+    fn is_match(&self, candidate: &Candidate<'_>) -> bool {
         if candidate.ext.is_empty() {
             return false;
         }
@@ -732,7 +732,7 @@ impl RequiredExtensionStrategy {
     }
 
     #[inline(never)]
-    fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
+    fn matches_into(&self, candidate: &Candidate<'_>, matches: &mut Vec<usize>) {
         if candidate.ext.is_empty() {
             return;
         }
@@ -753,11 +753,11 @@ struct RegexSetStrategy {
 }
 
 impl RegexSetStrategy {
-    fn is_match(&self, candidate: &Candidate) -> bool {
+    fn is_match(&self, candidate: &Candidate<'_>) -> bool {
         self.matcher.is_match(candidate.path.as_bytes())
     }
 
-    fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
+    fn matches_into(&self, candidate: &Candidate<'_>, matches: &mut Vec<usize>) {
         for i in self.matcher.matches(candidate.path.as_bytes()) {
             matches.push(self.map[i]);
         }

crates/globset/src/pathutil.rs

@@ -60,7 +60,7 @@ pub fn file_name_ext<'a>(name: &Cow<'a, [u8]>) -> Option<Cow<'a, [u8]>> {
 /// Normalizes a path to use `/` as a separator everywhere, even on platforms
 /// that recognize other characters as separators.
 #[cfg(unix)]
-pub fn normalize_path(path: Cow<[u8]>) -> Cow<[u8]> {
+pub fn normalize_path(path: Cow<'_, [u8]>) -> Cow<'_, [u8]> {
     // UNIX only uses /, so we're good.
     path
 }