diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-09 18:11:18 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-09 18:11:18 +0000 |
commit | a436863364937633335bba8fe4fd81c8fdc33837 (patch) | |
tree | e2f4fc606210a3adaa9d43e58e822ac4d5cec988 /crates/hir_ty/src/method_resolution.rs | |
parent | 9a5c72d9f07760fe875ef653a956fcaa1fe5d0de (diff) | |
parent | b885e6bdeeb1023df53b3f292cfe301448eeaeef (diff) |
Merge #7948
7948: Delete `ContainerId` r=jonas-schievink a=jonas-schievink
Since block expressions containing items now have a `ModuleId`, there's no need to also treat `DefWithBodyId` as a potential item container. Since https://github.com/rust-analyzer/rust-analyzer/pull/7878, only the `ModuleId` variant of `ContainerId` was ever created, so just delete the thing and use `ModuleId` everywhere.
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/method_resolution.rs')
-rw-r--r-- | crates/hir_ty/src/method_resolution.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs index 248367267..ccc12c075 100644 --- a/crates/hir_ty/src/method_resolution.rs +++ b/crates/hir_ty/src/method_resolution.rs | |||
@@ -267,7 +267,7 @@ impl Ty { | |||
267 | LangItemTarget::ImplDefId(it) => Some(it), | 267 | LangItemTarget::ImplDefId(it) => Some(it), |
268 | _ => None, | 268 | _ => None, |
269 | }) | 269 | }) |
270 | .map(|it| it.lookup(db.upcast()).container.module(db.upcast()).krate()) | 270 | .map(|it| it.lookup(db.upcast()).container.krate()) |
271 | .collect(); | 271 | .collect(); |
272 | Some(res) | 272 | Some(res) |
273 | } | 273 | } |