diff options
Diffstat (limited to 'crates/ra_hir/src/source_binder.rs')
-rw-r--r-- | crates/ra_hir/src/source_binder.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index a6f0ab289..42399622a 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs | |||
@@ -19,11 +19,7 @@ use ra_syntax::{ | |||
19 | 19 | ||
20 | use crate::{ | 20 | use crate::{ |
21 | HirDatabase, Function, Struct, Enum, Const, Static, Either, DefWithBody, PerNs, Name, | 21 | HirDatabase, Function, Struct, Enum, Const, Static, Either, DefWithBody, PerNs, Name, |
22 | <<<<<<< HEAD | 22 | AsName, Module, HirFileId, Crate, Trait, Resolver, Ty, ImportResolver, |
23 | AsName, Module, HirFileId, Crate, Trait, Resolver, Ty, | ||
24 | ======= | ||
25 | AsName, Module, HirFileId, Crate, Trait, Resolver, ImportResolver, | ||
26 | >>>>>>> complete_import: add new import resolver infrastructure with some hardcoded importable name. | ||
27 | expr::{BodySourceMap, scope::{ScopeId, ExprScopes}}, | 23 | expr::{BodySourceMap, scope::{ScopeId, ExprScopes}}, |
28 | ids::LocationCtx, | 24 | ids::LocationCtx, |
29 | expr, AstId, | 25 | expr, AstId, |