Unnamed repository; edit this file 'description' to name the repository.
rename "trait_def" to "def_in_trait"
| -rw-r--r-- | crates/ide-db/src/rename.rs | 7 | ||||
| -rw-r--r-- | crates/ide-db/src/search.rs | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/crates/ide-db/src/rename.rs b/crates/ide-db/src/rename.rs index 505ebc98f3..bade88c578 100644 --- a/crates/ide-db/src/rename.rs +++ b/crates/ide-db/src/rename.rs @@ -271,7 +271,7 @@ fn rename_reference( } } - let def = convert_to_trait_def(def, sema); + let def = convert_to_def_in_trait(def, sema); let usages = def.usages(sema).all(); if !usages.is_empty() && ident_kind == IdentifierKind::Underscore { @@ -298,7 +298,10 @@ fn rename_reference( Ok(source_change) } -pub(crate) fn convert_to_trait_def(def: Definition, sema: &Semantics<RootDatabase>) -> Definition { +pub(crate) fn convert_to_def_in_trait( + def: Definition, + sema: &Semantics<RootDatabase>, +) -> Definition { // HACK: resolve trait impl items to the item def of the trait definition // so that we properly resolve all trait item references let assoc_item = match def { diff --git a/crates/ide-db/src/search.rs b/crates/ide-db/src/search.rs index 25065ba7e3..ce38fe145b 100644 --- a/crates/ide-db/src/search.rs +++ b/crates/ide-db/src/search.rs @@ -620,7 +620,7 @@ impl<'a> FindUsages<'a> { sink(file_id, reference) } Some(NameRefClass::Definition(def)) - if crate::rename::convert_to_trait_def(def, self.sema) == self.def => + if crate::rename::convert_to_def_in_trait(def, self.sema) == self.def => { let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax()); let reference = FileReference { |