summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsharkdp <davidpeter@web.de>2017-10-26 21:13:56 +0200
committersharkdp <davidpeter@web.de>2017-10-26 21:13:56 +0200
commitbba5c4f607d8eea3182f84d0dff29b48d795e6bf (patch)
tree06132a8e51b0cbe65748366b020986c4afb75820
parent614f576c47f2afaff77752d43ef7eb76dfb1131e (diff)
Fix some clippy warningsv5.0.0
-rw-r--r--src/main.rs2
-rw-r--r--src/walk.rs2
-rw-r--r--tests/tests.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs
index c76ae96..e16e26d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -150,7 +150,7 @@ fn main() {
exclude_patterns: matches
.values_of("exclude")
.map(|v| v.map(|p| String::from("!") + p).collect())
- .unwrap_or(vec![]),
+ .unwrap_or_else(|| vec![]),
};
match RegexBuilder::new(pattern)
diff --git a/src/walk.rs b/src/walk.rs
index 39eb327..0dcbc87 100644
--- a/src/walk.rs
+++ b/src/walk.rs
@@ -51,7 +51,7 @@ pub fn scan(root: &Path, pattern: Arc<Regex>, config: Arc<FdOptions>) {
let mut override_builder = OverrideBuilder::new(root);
- for pattern in config.exclude_patterns.iter() {
+ for pattern in &config.exclude_patterns {
let res = override_builder.add(pattern);
if res.is_err() {
error(&format!("Error: malformed exclude pattern '{}'", pattern));
diff --git a/tests/tests.rs b/tests/tests.rs
index 29279c7..d3c09f1 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -469,7 +469,7 @@ fn test_symlink() {
let parent_parent = if cfg!(windows) { ".." } else { "../.." };
te.assert_output_subdirectory(
"symlink",
- &["", &parent_parent],
+ &["", parent_parent],
&format!(
"{dir}/a.foo
{dir}/e1 e2