Skip to content

Commit db4a1fc

Browse files
committed
Replace some AssocItem::containing_trait calls trait_or_trait_impl
1 parent 48f65b3 commit db4a1fc

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

crates/ide/src/goto_implementation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ pub(crate) fn goto_implementation(
5252
hir::ModuleDef::Function(f) => {
5353
let assoc = f.as_assoc_item(sema.db)?;
5454
let name = assoc.name(sema.db)?;
55-
let trait_ = assoc.containing_trait(sema.db)?;
55+
let trait_ = assoc.containing_trait_or_trait_impl(sema.db)?;
5656
impls_for_trait_item(&sema, trait_, name)
5757
}
5858
hir::ModuleDef::Const(c) => {
5959
let assoc = c.as_assoc_item(sema.db)?;
6060
let name = assoc.name(sema.db)?;
61-
let trait_ = assoc.containing_trait(sema.db)?;
61+
let trait_ = assoc.containing_trait_or_trait_impl(sema.db)?;
6262
impls_for_trait_item(&sema, trait_, name)
6363
}
6464
_ => return None,

crates/ide_completion/src/render.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,10 @@ impl<'a> RenderContext<'a> {
111111
hir::AssocItem::TypeAlias(it) => self.is_deprecated(it),
112112
};
113113
is_assoc_deprecated
114-
|| assoc.containing_trait(db).map(|trait_| self.is_deprecated(trait_)).unwrap_or(false)
114+
|| assoc
115+
.containing_trait_or_trait_impl(db)
116+
.map(|trait_| self.is_deprecated(trait_))
117+
.unwrap_or(false)
115118
}
116119

117120
fn docs(&self, node: impl HasAttrs) -> Option<hir::Documentation> {

0 commit comments

Comments
 (0)