3 files changed, 15 insertions, 15 deletions

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 242d0549d..95d8da200 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -8,7 +8,7 @@ use crate::{
     SourceFileItems, SourceItemId,
     query_definitions,
     FnScopes,
-    macros::{MacroInvocationLoc, MacroInvocationId, MacroInput, MacroDef, MacroExpansion},
+    macros::{MacroCallLoc, MacroCallId, MacroInput, MacroDef, MacroExpansion},
     module::{ModuleId, ModuleTree, ModuleSource,
     nameres::{ItemMap, InputModuleItems}},
     ty::{InferenceResult, Ty},
@@ -19,10 +19,10 @@ salsa::query_group! {
 
 pub trait HirDatabase: SyntaxDatabase
     + AsRef<LocationIntener<DefLoc, DefId>>
-    + AsRef<LocationIntener<MacroInvocationLoc, MacroInvocationId>>
+    + AsRef<LocationIntener<MacroCallLoc, MacroCallId>>
 {
-    fn expand_macro_invocation(invoc: MacroInvocationId) -> Option<Arc<MacroExpansion>> {
-        type ExpandMacroInvocationQuery;
+    fn expand_macro_invocation(invoc: MacroCallId) -> Option<Arc<MacroExpansion>> {
+        type ExpandMacroCallQuery;
         use fn crate::macros::expand_macro_invocation;
     }
 
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs
index 1bafb1c4d..4422ac45b 100644
--- a/crates/ra_hir/src/lib.rs
+++ b/crates/ra_hir/src/lib.rs
@@ -46,7 +46,7 @@ pub use self::{
     path::{Path, PathKind},
     name::Name,
     krate::Crate,
-    macros::{MacroDef, MacroInput, MacroExpansion, MacroInvocationId, MacroInvocationLoc},
+    macros::{MacroDef, MacroInput, MacroExpansion, MacroCallId, MacroCallLoc},
     module::{Module, ModuleId, Problem, nameres::{ItemMap, PerNs, Namespace}, ModuleScope, Resolution},
     function::{Function, FnScopes},
     adt::{Struct, Enum},
diff --git a/crates/ra_hir/src/macros.rs b/crates/ra_hir/src/macros.rs
index f0b99cc1a..d9de2d8bd 100644
--- a/crates/ra_hir/src/macros.rs
+++ b/crates/ra_hir/src/macros.rs
@@ -11,31 +11,31 @@ use crate::{SourceRootId, module::ModuleId, SourceItemId, HirDatabase};
 /// Def's are a core concept of hir. A `Def` is an Item (function, module, etc)
 /// in a specific module.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct MacroInvocationId(u32);
-ra_db::impl_numeric_id!(MacroInvocationId);
+pub struct MacroCallId(u32);
+ra_db::impl_numeric_id!(MacroCallId);
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct MacroInvocationLoc {
+pub struct MacroCallLoc {
     source_root_id: SourceRootId,
     module_id: ModuleId,
     source_item_id: SourceItemId,
 }
 
-impl MacroInvocationId {
+impl MacroCallId {
     pub(crate) fn loc(
         self,
-        db: &impl AsRef<LocationIntener<MacroInvocationLoc, MacroInvocationId>>,
-    ) -> MacroInvocationLoc {
+        db: &impl AsRef<LocationIntener<MacroCallLoc, MacroCallId>>,
+    ) -> MacroCallLoc {
         db.as_ref().id2loc(self)
     }
 }
 
-impl MacroInvocationLoc {
+impl MacroCallLoc {
     #[allow(unused)]
     pub(crate) fn id(
         &self,
-        db: &impl AsRef<LocationIntener<MacroInvocationLoc, MacroInvocationId>>,
-    ) -> MacroInvocationId {
+        db: &impl AsRef<LocationIntener<MacroCallLoc, MacroCallId>>,
+    ) -> MacroCallId {
         db.as_ref().loc2id(&self)
     }
 }
@@ -150,7 +150,7 @@ impl MacroExpansion {
 
 pub(crate) fn expand_macro_invocation(
     db: &impl HirDatabase,
-    invoc: MacroInvocationId,
+    invoc: MacroCallId,
 ) -> Option<Arc<MacroExpansion>> {
     let loc = invoc.loc(db);
     let syntax = db.file_item(loc.source_item_id);