From 200032852be0c66b978c875a8edf0eca1f08b901 Mon Sep 17 00:00:00 2001
From: Andrea Pretto <eulerdisk@gmail.com>
Date: Sun, 21 Apr 2019 23:55:47 +0200
Subject: complete_import: prevent panic when the anchor is the completion
 source range (fix rebase mess)

 Please enter the commit message for your changes. Lines starting
---
 crates/ra_hir/src/resolve.rs       | 4 ----
 crates/ra_hir/src/source_binder.rs | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'crates/ra_hir/src')

diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 0f866e6c2..ce80be17f 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -14,12 +14,8 @@ use crate::{
     generics::GenericParams,
     expr::{scope::{ExprScopes, ScopeId}, PatId},
     impl_block::ImplBlock,
-<<<<<<< HEAD
     path::Path,
     Trait
-=======
-    path::Path, Trait,
->>>>>>> complete_import: add new import resolver infrastructure with some hardcoded importable name.
 };
 
 #[derive(Debug, Clone, Default)]
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::{
 
 use crate::{
     HirDatabase, Function, Struct, Enum, Const, Static, Either, DefWithBody, PerNs, Name,
-<<<<<<< HEAD
-    AsName, Module, HirFileId, Crate, Trait, Resolver, Ty,
-=======
-    AsName, Module, HirFileId, Crate, Trait, Resolver, ImportResolver,
->>>>>>> complete_import: add new import resolver infrastructure with some hardcoded importable name.
+    AsName, Module, HirFileId, Crate, Trait, Resolver, Ty, ImportResolver,
     expr::{BodySourceMap, scope::{ScopeId, ExprScopes}},
     ids::LocationCtx,
     expr, AstId,
-- 
cgit v1.2.3