bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Remove unecessary unwrap
Browse Source
Christofer Nolander 2022-05-21
parent aef1630 · commit 068b138
Diffstat
-rw-r--r--crates/ide-assists/src/handlers/auto_import.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/crates/ide-assists/src/handlers/auto_import.rs b/crates/ide-assists/src/handlers/auto_import.rs
index 3316b71de2..11b2c59cd7 100644
--- a/crates/ide-assists/src/handlers/auto_import.rs
+++ b/crates/ide-assists/src/handlers/auto_import.rs
@@ -189,10 +189,12 @@ fn relevance_score(ctx: &AssistContext, import: &LocatedImport) -> i32 {
}
}
- match item_module.zip(current_node) {
+ let current_scope = current_node.as_ref().and_then(|node| ctx.sema.scope(node));
+
+ match item_module.zip(current_scope) {
// get the distance between the modules (prefer items that are more local)
- Some((item_module, current_node)) => {
- let current_module = ctx.sema.scope(&current_node).unwrap().module();
+ Some((item_module, current_scope)) => {
+ let current_module = current_scope.module();
score -= module_distance_hueristic(&current_module, &item_module, db) as i32;
}