mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace some AssocItem::containing_trait calls trait_or_trait_impl

Browse Source
This commit is contained in:
Lukas Wirth 2021-06-11 19:55:24 +02:00
parent 48f65b3b15
commit db4a1fcab4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ide/src/goto_implementation.rs
View File

@ -52,13 +52,13 @@ pub(crate) fn goto_implementation(
hir::ModuleDef::Function(f) => { hir::ModuleDef::Function(f) => {
let assoc = f.as_assoc_item(sema.db)?; let assoc = f.as_assoc_item(sema.db)?;
let name = assoc.name(sema.db)?; let name = assoc.name(sema.db)?;
let trait_ = assoc.containing_trait(sema.db)?; let trait_ = assoc.containing_trait_or_trait_impl(sema.db)?;
impls_for_trait_item(&sema, trait_, name) impls_for_trait_item(&sema, trait_, name)
} }
hir::ModuleDef::Const(c) => { hir::ModuleDef::Const(c) => {
let assoc = c.as_assoc_item(sema.db)?; let assoc = c.as_assoc_item(sema.db)?;
let name = assoc.name(sema.db)?; let name = assoc.name(sema.db)?;
let trait_ = assoc.containing_trait(sema.db)?; let trait_ = assoc.containing_trait_or_trait_impl(sema.db)?;
impls_for_trait_item(&sema, trait_, name) impls_for_trait_item(&sema, trait_, name)
} }
_ => return None, _ => return None,

5
crates/ide_completion/src/render.rs
View File

@ -111,7 +111,10 @@ fn is_deprecated_assoc_item(&self, as_assoc_item: impl AsAssocItem) -> bool {
hir::AssocItem::TypeAlias(it) => self.is_deprecated(it), hir::AssocItem::TypeAlias(it) => self.is_deprecated(it),
}; };
is_assoc_deprecated is_assoc_deprecated
|| assoc.containing_trait(db).map(|trait_| self.is_deprecated(trait_)).unwrap_or(false) || assoc
.containing_trait_or_trait_impl(db)
.map(|trait_| self.is_deprecated(trait_))
.unwrap_or(false)
} }
fn docs(&self, node: impl HasAttrs) -> Option<hir::Documentation> { fn docs(&self, node: impl HasAttrs) -> Option<hir::Documentation> {