aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/ty/infer.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/ty/infer.rs')
-rw-r--r--crates/ra_hir/src/ty/infer.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index beb2efb7a..db9a8c9d1 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -26,7 +26,7 @@ use hir_def::{
26 path::known, 26 path::known,
27 resolver::{HasResolver, Resolver, TypeNs}, 27 resolver::{HasResolver, Resolver, TypeNs},
28 type_ref::{Mutability, TypeRef}, 28 type_ref::{Mutability, TypeRef},
29 AdtId, DefWithBodyId, 29 AdtId, AssocItemId, DefWithBodyId,
30}; 30};
31use hir_expand::{diagnostics::DiagnosticSink, name}; 31use hir_expand::{diagnostics::DiagnosticSink, name};
32use ra_arena::map::ArenaMap; 32use ra_arena::map::ArenaMap;
@@ -255,8 +255,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
255 self.result.variant_resolutions.insert(id, variant); 255 self.result.variant_resolutions.insert(id, variant);
256 } 256 }
257 257
258 fn write_assoc_resolution(&mut self, id: ExprOrPatId, item: AssocItem) { 258 fn write_assoc_resolution(&mut self, id: ExprOrPatId, item: AssocItemId) {
259 self.result.assoc_resolutions.insert(id, item); 259 self.result.assoc_resolutions.insert(id, item.into());
260 } 260 }
261 261
262 fn write_pat_ty(&mut self, pat: PatId, ty: Ty) { 262 fn write_pat_ty(&mut self, pat: PatId, ty: Ty) {