itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-25 11:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle trait in function

Browse Source 
Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com>
This commit is contained in:
Hayashi Mikihiro 2025-05-15 15:12:31 +09:00
parent 55dd2114ed
commit 48027bfc19
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crates/ide-assists/src/handlers/remove_unused_imports.rs
View File

@ -103,29 +103,12 @@ pub(crate) fn remove_unused_imports(acc: &mut Assists, ctx: &AssistContext<'_>)
})
.any(|d| used_once_in_scope(ctx, d, u.rename(), scope))
{
return Some(u);
Some(u)
} else {
return None;
}
}
match res {
PathResolutionPerNs {
type_ns: Some(PathResolution::Def(ModuleDef::Trait(ref t))),
value_ns,
macro_ns,
} => {
// If the trait or any item is used.
if is_trait_unused_in_scope(ctx, &u, scope, t) {
let path = [value_ns, macro_ns];
is_path_unused_in_scope(ctx, &u, scope, &path).then_some(u)
} else {
None
}
}
PathResolutionPerNs { type_ns, value_ns, macro_ns } => {
let path = [type_ns, value_ns, macro_ns];
is_path_unused_in_scope(ctx, &u, scope, &path).then_some(u)
None
}
} else {
is_path_per_ns_unused_in_scope(ctx, &u, scope, &res).then_some(u)
}
})
.peekable();
@ -148,6 +131,25 @@ pub(crate) fn remove_unused_imports(acc: &mut Assists, ctx: &AssistContext<'_>)
}
}
fn is_path_per_ns_unused_in_scope(
ctx: &AssistContext<'_>,
u: &ast::UseTree,
scope: &mut Vec<SearchScope>,
path: &PathResolutionPerNs,
) -> bool {
if let Some(PathResolution::Def(ModuleDef::Trait(ref t))) = path.type_ns {
if is_trait_unused_in_scope(ctx, u, scope, t) {
let path = [path.value_ns, path.macro_ns];
is_path_unused_in_scope(ctx, u, scope, &path)
} else {
false
}
} else {
let path = [path.type_ns, path.value_ns, path.macro_ns];
is_path_unused_in_scope(ctx, u, scope, &path)
}
}
fn is_path_unused_in_scope(
ctx: &AssistContext<'_>,
u: &ast::UseTree,