diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-20 19:23:31 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-20 19:23:31 +0000 |
| commit | 2cb2fb1a4807b4e53390c5f88c85106454706b64 (patch) | |
| tree | f081f89d08f2edf7859c6d3f9738f507c1dca2d6 /crates/ra_hir/src/ty/infer.rs | |
| parent | 6983afdea9f41e58d7ebbd15012532cd3935451f (diff) | |
| parent | 63f327be67a8e6e0786cc089fba5f9b3f53c5bd6 (diff) | |
Merge #2332
2332: Add HasResolver trait r=matklad a=matklad
bors merge
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/infer.rs')
| -rw-r--r-- | crates/ra_hir/src/ty/infer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index 092bc3a3f..7f9e81d64 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs | |||
| @@ -40,7 +40,7 @@ use crate::{ | |||
| 40 | code_model::TypeAlias, | 40 | code_model::TypeAlias, |
| 41 | db::HirDatabase, | 41 | db::HirDatabase, |
| 42 | expr::{BindingAnnotation, Body, ExprId, PatId}, | 42 | expr::{BindingAnnotation, Body, ExprId, PatId}, |
| 43 | resolve::{Resolver, TypeNs}, | 43 | resolve::{HasResolver, Resolver, TypeNs}, |
| 44 | ty::infer::diagnostics::InferenceDiagnostic, | 44 | ty::infer::diagnostics::InferenceDiagnostic, |
| 45 | Adt, AssocItem, ConstData, DefWithBody, FloatTy, FnData, Function, HasBody, IntTy, Path, | 45 | Adt, AssocItem, ConstData, DefWithBody, FloatTy, FnData, Function, HasBody, IntTy, Path, |
| 46 | StructField, VariantDef, | 46 | StructField, VariantDef, |