aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/resolve.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-06-10 23:06:11 +0100
committerAleksey Kladov <[email protected]>2019-06-10 23:26:20 +0100
commit156b7ee84210583fa2fdc7fb8ae1dccafdf80830 (patch)
tree5e0d18e023a095c64a02f1c44c4a82245c89beeb /crates/ra_hir/src/resolve.rs
parent75e6c03883c4533b1134c806d166b72200b4837d (diff)
use single version of either in hir
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r--crates/ra_hir/src/resolve.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 1b987c1b6..7f8b3812c 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -2,7 +2,6 @@
2use std::sync::Arc; 2use std::sync::Arc;
3 3
4use rustc_hash::{FxHashMap, FxHashSet}; 4use rustc_hash::{FxHashMap, FxHashSet};
5use either::Either;
6 5
7use crate::{ 6use crate::{
8 ModuleDef, Trait, MacroDef, 7 ModuleDef, Trait, MacroDef,
@@ -14,6 +13,7 @@ use crate::{
14 expr::{scope::{ExprScopes, ScopeId}, PatId}, 13 expr::{scope::{ExprScopes, ScopeId}, PatId},
15 impl_block::ImplBlock, 14 impl_block::ImplBlock,
16 path::Path, 15 path::Path,
16 either::Either,
17}; 17};
18 18
19#[derive(Debug, Clone, Default)] 19#[derive(Debug, Clone, Default)]
@@ -137,7 +137,7 @@ impl Resolver {
137 ) -> Option<MacroDef> { 137 ) -> Option<MacroDef> {
138 let (item_map, module) = self.module()?; 138 let (item_map, module) = self.module()?;
139 match item_map.resolve_path_with_macro(db, module, path) { 139 match item_map.resolve_path_with_macro(db, module, path) {
140 (Either::Right(macro_def), None) => Some(macro_def), 140 (Either::B(macro_def), None) => Some(macro_def),
141 _ => None, 141 _ => None,
142 } 142 }
143 } 143 }