diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-11 18:56:00 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-11 18:56:00 +0100 |
| commit | 863e23f00f90c0ddd408e906618586a98273a14c (patch) | |
| tree | 54e1a9bdeacaf894149e44141d2c5fc485c28ce3 /crates/ide | |
| parent | 21d441623574e5d5ffa2d8f1add7582c7231e109 (diff) | |
| parent | db4a1fcab4610db2ab31d2048ab49fbcbcfce1cc (diff) | |
Merge #9219
9219: minor: Replace some AssocItem::containing_trait calls trait_or_trait_impl r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/ide')
| -rw-r--r-- | crates/ide/src/goto_implementation.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs index 43356a94e..95fd39850 100644 --- a/crates/ide/src/goto_implementation.rs +++ b/crates/ide/src/goto_implementation.rs | |||
| @@ -52,13 +52,13 @@ pub(crate) fn goto_implementation( | |||
| 52 | hir::ModuleDef::Function(f) => { | 52 | hir::ModuleDef::Function(f) => { |
| 53 | let assoc = f.as_assoc_item(sema.db)?; | 53 | let assoc = f.as_assoc_item(sema.db)?; |
| 54 | let name = assoc.name(sema.db)?; | 54 | 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)?; |
| 56 | impls_for_trait_item(&sema, trait_, name) | 56 | impls_for_trait_item(&sema, trait_, name) |
| 57 | } | 57 | } |
| 58 | hir::ModuleDef::Const(c) => { | 58 | hir::ModuleDef::Const(c) => { |
| 59 | let assoc = c.as_assoc_item(sema.db)?; | 59 | let assoc = c.as_assoc_item(sema.db)?; |
| 60 | let name = assoc.name(sema.db)?; | 60 | 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)?; |
| 62 | impls_for_trait_item(&sema, trait_, name) | 62 | impls_for_trait_item(&sema, trait_, name) |
| 63 | } | 63 | } |
| 64 | _ => return None, | 64 | _ => return None, |