diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-14 18:16:48 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-14 18:16:48 +0000 |
commit | d6223253b628b279f9ddae8f83f7173d01f6b32c (patch) | |
tree | 12f2ccc5c52c1c0b67932d3a35fe18668b8e5d62 /crates/ra_hir_ty/src/infer.rs | |
parent | 202ad1e2d9376565cb273cf085be600ed10e5a93 (diff) | |
parent | 2619950b3b405324ab1c1745876165c834b3b4b9 (diff) |
Merge #2561
2561: Split generic and non-generic paths r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/infer.rs')
-rw-r--r-- | crates/ra_hir_ty/src/infer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir_ty/src/infer.rs b/crates/ra_hir_ty/src/infer.rs index f1b7e9442..af42854cc 100644 --- a/crates/ra_hir_ty/src/infer.rs +++ b/crates/ra_hir_ty/src/infer.rs | |||
@@ -386,7 +386,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
386 | let resolver = &self.resolver; | 386 | let resolver = &self.resolver; |
387 | // FIXME: this should resolve assoc items as well, see this example: | 387 | // FIXME: this should resolve assoc items as well, see this example: |
388 | // https://play.rust-lang.org/?gist=087992e9e22495446c01c0d4e2d69521 | 388 | // https://play.rust-lang.org/?gist=087992e9e22495446c01c0d4e2d69521 |
389 | match resolver.resolve_path_in_type_ns_fully(self.db, &path) { | 389 | match resolver.resolve_path_in_type_ns_fully(self.db, path.mod_path()) { |
390 | Some(TypeNs::AdtId(AdtId::StructId(strukt))) => { | 390 | Some(TypeNs::AdtId(AdtId::StructId(strukt))) => { |
391 | let substs = Ty::substs_from_path(self.db, resolver, path, strukt.into()); | 391 | let substs = Ty::substs_from_path(self.db, resolver, path, strukt.into()); |
392 | let ty = self.db.ty(strukt.into()); | 392 | let ty = self.db.ty(strukt.into()); |