user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add more test cases & improve docs & replace Vec with FxHashSet for segments

Browse source
This commit is contained in:
J-ZhengLi 2024-01-29 11:29:15 +08:00
parent d02df12bd5
commit 314bddee95
9 changed files with 92 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
clippy_lints/src/wildcard_imports.rs
View file

@ -101,11 +101,11 @@ declare_clippy_lint! {
pub struct WildcardImports {
warn_on_all: bool,
test_modules_deep: u32,
ignored_segments: Vec<String>,
ignored_segments: FxHashSet<String>,
}
impl WildcardImports {
pub fn new(warn_on_all: bool, ignored_wildcard_imports: Vec<String>) -> Self {
pub fn new(warn_on_all: bool, ignored_wildcard_imports: FxHashSet<String>) -> Self {
Self {
warn_on_all,
test_modules_deep: 0,
@ -212,10 +212,8 @@ fn is_super_only_import(segments: &[PathSegment<'_>]) -> bool {
// Allow skipping imports containing user configured segments,
// i.e. "...::utils::...::*" if user put `ignored-wildcard-imports = ["utils"]` in `Clippy.toml`
fn is_ignored_via_config(segments: &[PathSegment<'_>], ignored_segments: &[String]) -> bool {
let segments_set: FxHashSet<&str> = segments.iter().map(|s| s.ident.as_str()).collect();
let ignored_set: FxHashSet<&str> = ignored_segments.iter().map(String::as_str).collect();
fn is_ignored_via_config(segments: &[PathSegment<'_>], ignored_segments: &FxHashSet<String>) -> bool {
// segment matching need to be exact instead of using 'contains', in case user unintentionaly put
// a single character in the config thus skipping most of the warnings.
segments_set.intersection(&ignored_set).next().is_some()
segments.iter().any(|seg| ignored_segments.contains(seg.ident.as_str()))
}