From 759ceb984039dee7cac226c656cf599712b5e038 Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
Date: Thu, 11 Oct 2018 08:34:51 +0200
Subject: [PATCH] Use `impl Iterator` in arg position in clippy_dev
Small refactoring pulled out of work on #3266.
This should make the methods a bit more flexible.
---
clippy_dev/src/lib.rs | 6 +++---
clippy_dev/src/main.rs | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/clippy_dev/src/lib.rs b/clippy_dev/src/lib.rs
index 2087a4b0740..0e29db9bef0 100644
--- a/clippy_dev/src/lib.rs
+++ b/clippy_dev/src/lib.rs
@@ -56,8 +56,8 @@ impl Lint {
}
/// Returns all non-deprecated lints
- pub fn active_lints(lints: &[Self]) -> impl Iterator<Item=&Self> {
- lints.iter().filter(|l| l.deprecation.is_none())
+ pub fn active_lints(lints: impl Iterator<Item=Self>) -> impl Iterator<Item=Self> {
+ lints.filter(|l| l.deprecation.is_none())
}
/// Returns the lints in a HashMap, grouped by the different lint groups
@@ -144,7 +144,7 @@ fn test_active_lints() {
let expected = vec![
Lint::new("should_assert_eq2", "Not Deprecated", "abc", None, "module_name")
];
- assert_eq!(expected, Lint::active_lints(&lints).cloned().collect::<Vec<Lint>>());
+ assert_eq!(expected, Lint::active_lints(lints.into_iter()).collect::<Vec<Lint>>());
}
#[test]
diff --git a/clippy_dev/src/main.rs b/clippy_dev/src/main.rs
index 28f831a9b1c..d1161323b02 100644
--- a/clippy_dev/src/main.rs
+++ b/clippy_dev/src/main.rs
@@ -51,5 +51,5 @@ fn print_lints() {
}
}
- println!("there are {} lints", Lint::active_lints(&lint_list).count());
+ println!("there are {} lints", Lint::active_lints(lint_list.into_iter()).count());
}