Fix dogfood and pedantic lints

clippy_dev/src/lib.rs

@@ -78,26 +78,28 @@ pub fn gen_changelog_lint_list(lints: Vec<Lint>) -> Vec<String> {
     lint_list_sorted.sort_by_key(|l| l.name.clone());
     lint_list_sorted
         .iter()
-        .filter(|l| !l.is_internal())
+        .filter_map(|l| {
-        .map(|l| {
+            if l.is_internal() {
-            format!("[`{}`]: {}#{}", l.name, DOCS_LINK.clone(), l.name)
+                None
-        })
+            } else {
-        .collect()
+                Some(format!("[`{}`]: {}#{}", l.name, DOCS_LINK.clone(), l.name))
+            }
+        }).collect()
 }
 
-/// Generates the 'register_removed' code in `./clippy_lints/src/lib.rs`.
+/// Generates the `register_removed` code in `./clippy_lints/src/lib.rs`.
-pub fn gen_deprecated(lints: Vec<Lint>) -> Vec<String> {
+pub fn gen_deprecated(lints: &[Lint]) -> Vec<String> {
     lints.iter()
-        .filter(|l| l.deprecation.is_some())
+        .filter_map(|l| {
-        .map(|l| {
+            l.clone().deprecation.and_then(|depr_text| {
-            format!(
+                Some(
-                r#"    store.register_removed(
+                    format!(
-        "{}",
+                        "    store.register_removed(\n        \"{}\",\n        \"{}\",\n    );",
-        "{}",
+                        l.name,
-    );"#,
+                        depr_text
-                l.name,
+                    )
-                l.deprecation.clone().unwrap()
+                )
-            )
+            })
         })
         .collect()
 }
@@ -352,5 +354,5 @@ fn test_gen_deprecated() {
         "has been superseeded by should_assert_eq2",
     );"#.to_string()
     ];
-    assert_eq!(expected, gen_deprecated(lints));
+    assert_eq!(expected, gen_deprecated(&lints));
 }

clippy_dev/src/main.rs

@@ -88,6 +88,6 @@ fn update_lints() {
         "begin deprecated lints",
         "end deprecated lints",
         false,
-        || { gen_deprecated(lint_list.clone()) }
+        || { gen_deprecated(&lint_list) }
     );
 }