rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs')

-rw-r--r--

1 files changed, 3 insertions, 2 deletions

diff --git a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
index 5ff4af19fb..248f18789c 100644
--- a/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs

@@ -70,6 +70,7 @@ pub(crate) fn replace_derive_with_manual_impl(

let current_module = ctx.sema.scope(adt.syntax())?.module();

let current_crate = current_module.krate();

+ let current_edition = current_crate.edition(ctx.db());

let found_traits = items_locator::items_with_name(

&ctx.sema,

@@ -85,7 +86,7 @@ pub(crate) fn replace_derive_with_manual_impl(

current_module

.find_path(ctx.sema.db, hir::ModuleDef::Trait(trait_), ctx.config.import_path_config())

.as_ref()

- .map(mod_path_to_ast)

+ .map(|path| mod_path_to_ast(path, current_edition))

.zip(Some(trait_))

});

@@ -214,7 +215,7 @@ fn impl_def_from_trait(

let impl_def = generate_trait_impl(adt, make::ty_path(trait_path.clone()));

let first_assoc_item =

- add_trait_assoc_items_to_impl(sema, &trait_items, trait_, &impl_def, target_scope);

+ add_trait_assoc_items_to_impl(sema, &trait_items, trait_, &impl_def, &target_scope);

// Generate a default `impl` function body for the derived trait.

if let ast::AssocItem::Fn(ref func) = first_assoc_item {