about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-01-25 20:00:20 +0000
committerbors <bors@rust-lang.org>2019-01-25 20:00:20 +0000
commit8a02512ab36741bcc5a83344d0519759491e6eae (patch)
treea88b50843cf765c770aa0a196501e72801cb23c7
parentaca1b8112026d9707b8041abfd4349c9b865db1f (diff)
parent873fe11ca56d17de0fb52bea1adf27b02f00c018 (diff)
downloadrust-8a02512ab36741bcc5a83344d0519759491e6eae.tar.gz
rust-8a02512ab36741bcc5a83344d0519759491e6eae.zip
Auto merge of #3699 - matthiaskrgr:itertools, r=oli-obk
dependencies: update itertools from 0.7 to 0.8
-rw-r--r--clippy_dev/Cargo.toml2
-rw-r--r--clippy_dev/src/lib.rs25
-rw-r--r--clippy_lints/Cargo.toml2
3 files changed, 17 insertions, 12 deletions
diff --git a/clippy_dev/Cargo.toml b/clippy_dev/Cargo.toml
index 5380ecd9814..3b4a11a5ee5 100644
--- a/clippy_dev/Cargo.toml
+++ b/clippy_dev/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 clap = "~2.32"
-itertools = "0.7"
+itertools = "0.8"
 regex = "1"
 lazy_static = "1.0"
 walkdir = "2"
diff --git a/clippy_dev/src/lib.rs b/clippy_dev/src/lib.rs
index 073b3a9e97f..1c7f372af6b 100644
--- a/clippy_dev/src/lib.rs
+++ b/clippy_dev/src/lib.rs
@@ -82,6 +82,7 @@ pub fn gen_lint_group_list(lints: Vec<Lint>) -> Vec<String> {
             }
         })
         .sorted()
+        .collect::<Vec<String>>()
 }
 
 /// Generates the `pub mod module_name` list in `clippy_lints/src/lib.rs`.
@@ -98,6 +99,7 @@ pub fn gen_modules_list(lints: Vec<Lint>) -> Vec<String> {
         .unique()
         .map(|module| format!("pub mod {};", module))
         .sorted()
+        .collect::<Vec<String>>()
 }
 
 /// Generates the list of lint links at the bottom of the README
@@ -118,17 +120,20 @@ pub fn gen_changelog_lint_list(lints: Vec<Lint>) -> Vec<String> {
 
 /// Generates the `register_removed` code in `./clippy_lints/src/lib.rs`.
 pub fn gen_deprecated(lints: &[Lint]) -> Vec<String> {
-    itertools::flatten(lints.iter().filter_map(|l| {
-        l.clone().deprecation.and_then(|depr_text| {
-            Some(vec![
-                "    store.register_removed(".to_string(),
-                format!("        \"{}\",", l.name),
-                format!("        \"{}\",", depr_text),
-                "    );".to_string(),
-            ])
+    lints
+        .iter()
+        .filter_map(|l| {
+            l.clone().deprecation.and_then(|depr_text| {
+                Some(vec![
+                    "    store.register_removed(".to_string(),
+                    format!("        \"{}\",", l.name),
+                    format!("        \"{}\",", depr_text),
+                    "    );".to_string(),
+                ])
+            })
         })
-    }))
-    .collect()
+        .flatten()
+        .collect::<Vec<String>>()
 }
 
 /// Gathers all files in `src/clippy_lints` and gathers all lints inside
diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml
index 67dcffbfe1b..6c7f2d25569 100644
--- a/clippy_lints/Cargo.toml
+++ b/clippy_lints/Cargo.toml
@@ -18,7 +18,7 @@ edition = "2018"
 
 [dependencies]
 cargo_metadata = "0.6.2"
-itertools = "0.7"
+itertools = "0.8"
 lazy_static = "1.0.2"
 matches = "0.1.7"
 quine-mc_cluskey = "0.2.2"