Rename active_lints to usable_lints

Because now `usable_lints` will also exclude internal lints.
This commit is contained in:
Philipp Hansch 2018-10-16 07:24:32 +02:00
parent eb683e6070
commit af441b5b07
No known key found for this signature in database
GPG key ID: B6FA06A6E0E2665B
2 changed files with 13 additions and 9 deletions

View file

@ -57,9 +57,9 @@ impl Lint {
} }
} }
/// Returns all non-deprecated lints /// Returns all non-deprecated lints and non-internal lints
pub fn active_lints(lints: impl Iterator<Item=Self>) -> impl Iterator<Item=Self> { pub fn usable_lints(lints: impl Iterator<Item=Self>) -> impl Iterator<Item=Self> {
lints.filter(|l| l.deprecation.is_none()) lints.filter(|l| l.deprecation.is_none() && !l.group.starts_with("internal"))
} }
/// Returns the lints in a HashMap, grouped by the different lint groups /// Returns the lints in a HashMap, grouped by the different lint groups
@ -141,15 +141,17 @@ declare_deprecated_lint! {
} }
#[test] #[test]
fn test_active_lints() { fn test_usable_lints() {
let lints = vec![ let lints = vec![
Lint::new("should_assert_eq", "Deprecated", "abc", Some("Reason"), "module_name"), Lint::new("should_assert_eq", "Deprecated", "abc", Some("Reason"), "module_name"),
Lint::new("should_assert_eq2", "Not Deprecated", "abc", None, "module_name") Lint::new("should_assert_eq2", "Not Deprecated", "abc", None, "module_name"),
Lint::new("should_assert_eq2", "internal", "abc", None, "module_name"),
Lint::new("should_assert_eq2", "internal_style", "abc", None, "module_name")
]; ];
let expected = vec![ let expected = vec![
Lint::new("should_assert_eq2", "Not Deprecated", "abc", None, "module_name") Lint::new("should_assert_eq2", "Not Deprecated", "abc", None, "module_name")
]; ];
assert_eq!(expected, Lint::active_lints(lints.into_iter()).collect::<Vec<Lint>>()); assert_eq!(expected, Lint::usable_lints(lints.into_iter()).collect::<Vec<Lint>>());
} }
#[test] #[test]

View file

@ -37,8 +37,10 @@ fn main() {
} }
fn print_lints() { fn print_lints() {
let lint_list = gather_all().collect::<Vec<Lint>>(); let lint_list = gather_all();
let grouped_by_lint_group = Lint::by_lint_group(&lint_list); let usable_lints: Vec<Lint> = Lint::usable_lints(lint_list).collect();
let lint_count = usable_lints.len();
let grouped_by_lint_group = Lint::by_lint_group(&usable_lints);
for (lint_group, mut lints) in grouped_by_lint_group { for (lint_group, mut lints) in grouped_by_lint_group {
if lint_group == "Deprecated" { continue; } if lint_group == "Deprecated" { continue; }
@ -51,5 +53,5 @@ fn print_lints() {
} }
} }
println!("there are {} lints", Lint::active_lints(lint_list.into_iter()).count()); println!("there are {} lints", lint_count);
} }