diff options
author | Aleksey Kladov <[email protected]> | 2019-11-22 15:46:39 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-11-22 15:46:39 +0000 |
commit | d4f4ae0dd88f0baf0065d612f41fea3d54af79fd (patch) | |
tree | a08c33528a8a1579c9017e43ad3b28042e77f8fe /crates/ra_hir/src/ty/infer.rs | |
parent | b841c53a0c93cdca3f08b1c917c9fa8a63d31604 (diff) |
Move const&static date to hir_def
Diffstat (limited to 'crates/ra_hir/src/ty/infer.rs')
-rw-r--r-- | crates/ra_hir/src/ty/infer.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 6e07ab86e..39976a359 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs | |||
@@ -22,7 +22,7 @@ use ena::unify::{InPlaceUnificationTable, NoError, UnifyKey, UnifyValue}; | |||
22 | use rustc_hash::FxHashMap; | 22 | use rustc_hash::FxHashMap; |
23 | 23 | ||
24 | use hir_def::{ | 24 | use hir_def::{ |
25 | data::FunctionData, | 25 | data::{ConstData, FunctionData}, |
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}, |
@@ -44,8 +44,8 @@ use crate::{ | |||
44 | db::HirDatabase, | 44 | db::HirDatabase, |
45 | expr::{BindingAnnotation, Body, ExprId, PatId}, | 45 | expr::{BindingAnnotation, Body, ExprId, PatId}, |
46 | ty::infer::diagnostics::InferenceDiagnostic, | 46 | ty::infer::diagnostics::InferenceDiagnostic, |
47 | Adt, AssocItem, ConstData, DefWithBody, FloatTy, Function, HasBody, IntTy, Path, StructField, | 47 | Adt, AssocItem, DefWithBody, FloatTy, Function, HasBody, IntTy, Path, StructField, Trait, |
48 | Trait, VariantDef, | 48 | VariantDef, |
49 | }; | 49 | }; |
50 | 50 | ||
51 | macro_rules! ty_app { | 51 | macro_rules! ty_app { |
@@ -560,7 +560,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
560 | } | 560 | } |
561 | 561 | ||
562 | fn collect_const(&mut self, data: &ConstData) { | 562 | fn collect_const(&mut self, data: &ConstData) { |
563 | self.return_ty = self.make_ty(data.type_ref()); | 563 | self.return_ty = self.make_ty(&data.type_ref); |
564 | } | 564 | } |
565 | 565 | ||
566 | fn collect_fn(&mut self, data: &FunctionData) { | 566 | fn collect_fn(&mut self, data: &FunctionData) { |