bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs')
-rw-r--r--crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs17
1 files changed, 7 insertions, 10 deletions
diff --git a/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs
index fa005a411d..f6526cdba4 100644
--- a/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs
@@ -63,12 +63,9 @@ pub(crate) fn replace_qualified_name_with_use(
);
let path_to_qualifier = starts_with_name_ref
.then(|| {
- ctx.sema.scope(original_path.syntax())?.module().find_use_path(
- ctx.sema.db,
- module,
- ctx.config.insert_use.prefix_kind,
- ctx.config.import_path_config(),
- )
+ let mod_ = ctx.sema.scope(original_path.syntax())?.module();
+ let cfg = ctx.config.find_path_config(ctx.sema.is_nightly(mod_.krate()));
+ mod_.find_use_path(ctx.sema.db, module, ctx.config.insert_use.prefix_kind, cfg)
})
.flatten();
@@ -102,10 +99,10 @@ pub(crate) fn replace_qualified_name_with_use(
fn drop_generic_args(path: &ast::Path) -> ast::Path {
let path = path.clone_for_update();
- if let Some(segment) = path.segment() {
- if let Some(generic_args) = segment.generic_arg_list() {
- ted::remove(generic_args.syntax());
- }
+ if let Some(segment) = path.segment()
+ && let Some(generic_args) = segment.generic_arg_list()
+ {
+ ted::remove(generic_args.syntax());
}
path
}