From 98531dc785535ccde9edc798a17275b9a2f5c1fb Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 12 May 2019 22:51:03 +0300
Subject: simplify

---
 crates/ra_hir/src/resolve.rs       |  2 +-
 crates/ra_hir/src/source_binder.rs | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'crates/ra_hir/src')

diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index 2fb219908..f1c7d7566 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -134,7 +134,7 @@ impl Resolver {
         resolution
     }
 
-    pub fn resolve_macro_call(
+    pub(crate) fn resolve_macro_call(
         &self,
         db: &impl HirDatabase,
         path: Option<Path>,
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 31bf13425..bb485e35f 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -20,7 +20,7 @@ use crate::{
     HirDatabase, Function, Struct, Enum, Const, Static, Either, DefWithBody, PerNs, Name,
     AsName, Module, HirFileId, Crate, Trait, Resolver, Ty,Path,
     expr::{BodySourceMap, scope::{ScopeId, ExprScopes}},
-    ids::{LocationCtx,MacroCallId},
+    ids::{LocationCtx, MacroDefId},
     docs::{docs_from_ast,Documentation},
     expr, AstId,
 };
@@ -191,13 +191,12 @@ pub enum PathResolution {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct MacroByExampleDef {
-    pub(crate) id: MacroCallId,
+    pub(crate) id: MacroDefId,
 }
 
 impl MacroByExampleDef {
     pub fn source(&self, db: &impl HirDatabase) -> (HirFileId, TreeArc<ast::MacroCall>) {
-        let loc = self.id.loc(db);
-        (self.id.into(), loc.def.0.to_node(db))
+        (self.id.0.file_id(), self.id.0.to_node(db))
     }
 }
 
@@ -296,9 +295,9 @@ impl SourceAnalyzer {
             db,
             macro_call.path().and_then(Path::from_ast),
             ast_id,
-        );
-
-        call_id.map(|id| MacroByExampleDef { id })
+        )?;
+        let loc = call_id.loc(db);
+        Some(MacroByExampleDef { id: loc.def })
     }
 
     pub fn resolve_hir_path(
-- 
cgit v1.2.3