Get rid of Lint::is_internal method

diff --git a/clippy_dev/src/lib.rs b/clippy_dev/src/lib.rs
index b01112539befc277efed36bba7ba95e98fd730fb..4531d9b39c0e08532001f64426fbcccdcafc0286 100644 (file)
--- a/clippy_dev/src/lib.rs
+++ b/clippy_dev/src/lib.rs
@@ -63,7 +63,7 @@ pub fn new(name: &str, group: &str, desc: &str, deprecation: Option<&str>, modul
 
     /// Returns all non-deprecated lints and non-internal lints
     pub fn usable_lints(lints: impl Iterator<Item = Self>) -> impl Iterator<Item = Self> {
-        lints.filter(|l| l.deprecation.is_none() && !l.is_internal())
+        lints.filter(|l| l.deprecation.is_none() && !l.group.starts_with("internal"))
     }
 
     /// Returns all internal lints (not `internal_warn` lints)
@@ -76,11 +76,6 @@ pub fn internal_lints(lints: impl Iterator<Item = Self>) -> impl Iterator<Item =
     pub fn by_lint_group(lints: impl Iterator<Item = Self>) -> HashMap<String, Vec<Self>> {
         lints.map(|lint| (lint.group.to_string(), lint)).into_group_map()
     }
-
-    #[must_use]
-    pub fn is_internal(&self) -> bool {
-        self.group.starts_with("internal")
-    }
 }
 
 /// Generates the Vec items for `register_lint_group` calls in `clippy_lints/src/lib.rs`.
@@ -103,14 +98,8 @@ pub fn gen_lint_group_list(lints: &[Lint]) -> Vec<String> {
 #[must_use]
 pub fn gen_modules_list(lints: &[Lint]) -> Vec<String> {
     lints
-        .into_iter()
-        .filter_map(|l| {
-            if l.is_internal() || l.deprecation.is_some() {
-                None
-            } else {
-                Some(l.module.clone())
-            }
-        })
+        .iter()
+        .map(|l| &l.module)
         .unique()
         .map(|module| format!("pub mod {};", module))
         .sorted()
@@ -124,7 +113,7 @@ pub fn gen_changelog_lint_list(lints: &[Lint]) -> Vec<String> {
         .iter()
         .sorted_by_key(|l| l.name.clone())
         .filter_map(|l| {
-            if l.is_internal() {
+            if l.group.starts_with("internal") {
                 None
             } else {
                 Some(format!("[`{}`]: {}#{}", l.name, DOCS_LINK, l.name))
@@ -158,13 +147,7 @@ pub fn gen_register_lint_list(lints: &[Lint]) -> Vec<String> {
     let post = "    ]);".to_string();
     let mut inner = lints
         .iter()
-        .filter_map(|l| {
-            if !l.is_internal() && l.deprecation.is_none() {
-                Some(format!("        &{}::{},", l.module, l.name.to_uppercase()))
-            } else {
-                None
-            }
-        })
+        .map(|l| format!("        &{}::{},", l.module, l.name.to_uppercase()))
         .sorted()
         .collect::<Vec<String>>();
     inner.insert(0, pre);

diff --git a/clippy_dev/src/update_lints.rs b/clippy_dev/src/update_lints.rs
index d709e4892fe28f2b5b83cc95aa02fab7fb5c9360..be565700b012d52d27dc4b265ee6fc365567b40f 100644 (file)
--- a/clippy_dev/src/update_lints.rs
+++ b/clippy_dev/src/update_lints.rs
@@ -81,7 +81,7 @@ pub fn run(update_mode: UpdateMode) {
         "end register lints",
         false,
         update_mode == UpdateMode::Change,
-        || gen_register_lint_list(&lint_list),
+        || gen_register_lint_list(&usable_lints),
     )
     .changed;
 
@@ -91,7 +91,7 @@ pub fn run(update_mode: UpdateMode) {
         "end lints modules",
         false,
         update_mode == UpdateMode::Change,
-        || gen_modules_list(&lint_list),
+        || gen_modules_list(&usable_lints),
     )
     .changed;