mirror of
https://github.com/rust-lang/rust.git
synced 2026-04-27 18:57:42 +03:00
Merge pull request #22054 from jdrouet/jdrouet/remove-duplicate-lints
fix(21943): remove duplicate lints
This commit is contained in:
@@ -1804,13 +1804,6 @@ pub struct LintGroup {
|
||||
warn_since: None,
|
||||
deny_since: None,
|
||||
},
|
||||
Lint {
|
||||
label: "warnings",
|
||||
description: r##"lint group for: all lints that are set to issue warnings"##,
|
||||
default_severity: Severity::Allow,
|
||||
warn_since: None,
|
||||
deny_since: None,
|
||||
},
|
||||
];
|
||||
|
||||
pub const DEFAULT_LINT_GROUPS: &[LintGroup] = &[
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#![allow(clippy::disallowed_types)]
|
||||
|
||||
use std::{
|
||||
collections::{HashMap, hash_map},
|
||||
collections::{HashMap, HashSet, hash_map},
|
||||
fs,
|
||||
path::Path,
|
||||
str::FromStr,
|
||||
@@ -348,10 +348,12 @@ fn get_lints(
|
||||
buf.push_str(r#"pub const DEFAULT_LINTS: &[Lint] = &["#);
|
||||
buf.push('\n');
|
||||
|
||||
let mut known_lints: HashSet<&String> = HashSet::with_capacity(lints.len() + lint_groups.len());
|
||||
for (name, lint) in &lints {
|
||||
push_lint_completion(buf, name, lint);
|
||||
known_lints.insert(name);
|
||||
}
|
||||
for (name, (group, _)) in &lint_groups {
|
||||
for (name, (group, _)) in lint_groups.iter().filter(|(name, _)| !known_lints.contains(name)) {
|
||||
push_lint_completion(buf, name, group);
|
||||
}
|
||||
buf.push_str("];\n\n");
|
||||
@@ -372,10 +374,15 @@ fn get_lints(
|
||||
buf.push_str(r#"pub const RUSTDOC_LINTS: &[Lint] = &["#);
|
||||
buf.push('\n');
|
||||
|
||||
let mut known_rustdoc_lints: HashSet<&String> =
|
||||
HashSet::with_capacity(lints_rustdoc.len() + lint_groups_rustdoc.len());
|
||||
for (name, lint) in &lints_rustdoc {
|
||||
push_lint_completion(buf, name, lint);
|
||||
known_rustdoc_lints.insert(name);
|
||||
}
|
||||
for (name, (group, _)) in &lint_groups_rustdoc {
|
||||
for (name, (group, _)) in
|
||||
lint_groups_rustdoc.iter().filter(|(name, _)| !known_rustdoc_lints.contains(name))
|
||||
{
|
||||
push_lint_completion(buf, name, group);
|
||||
}
|
||||
buf.push_str("];\n\n");
|
||||
|
||||
Reference in New Issue
Block a user