1 files changed, 16 insertions, 56 deletions

diff --git a/crates/hir_def/src/body.rs b/crates/hir_def/src/body.rs
index 44ae13643..8a9b936ea 100644
--- a/crates/hir_def/src/body.rs
+++ b/crates/hir_def/src/body.rs
@@ -19,7 +19,7 @@ use hir_expand::{
 use la_arena::{Arena, ArenaMap};
 use profile::Count;
 use rustc_hash::FxHashMap;
-use syntax::{ast, AstNode, AstPtr, SyntaxNode};
+use syntax::{ast, AstNode, AstPtr};
 
 pub use lower::LowerCtx;
 
@@ -98,14 +98,11 @@ impl Expander {
         }
     }
 
-    fn enter_expand_intern(
+    pub(crate) fn enter_expand<T: ast::AstNode>(
         &mut self,
         db: &dyn DefDatabase,
         macro_call: ast::MacroCall,
-    ) -> Result<
-        ExpandResult<Option<(SyntaxNode, impl FnMut(&dyn DefDatabase) -> Mark + '_)>>,
-        UnresolvedMacro,
-    > {
+    ) -> Result<ExpandResult<Option<(Mark, T)>>, UnresolvedMacro> {
         if self.recursion_limit + 1 > EXPANSION_RECURSION_LIMIT {
             cov_mark::hit!(your_stack_belongs_to_me);
             return Ok(ExpandResult::str_err(
@@ -150,55 +147,6 @@ impl Expander {
             }
         };
 
-        let this = self;
-
-        let advance_state = move |db: &dyn DefDatabase| {
-            this.recursion_limit += 1;
-            let mark = Mark {
-                file_id: this.current_file_id,
-                ast_id_map: mem::take(&mut this.ast_id_map),
-                bomb: DropBomb::new("expansion mark dropped"),
-            };
-            this.cfg_expander.hygiene = Hygiene::new(db.upcast(), file_id);
-            this.current_file_id = file_id;
-            this.ast_id_map = db.ast_id_map(file_id);
-            mark
-        };
-
-        Ok(ExpandResult { value: Some((raw_node, advance_state)), err })
-    }
-
-    pub(crate) fn enter_expand_raw(
-        &mut self,
-        db: &dyn DefDatabase,
-        macro_call: ast::MacroCall,
-    ) -> Result<ExpandResult<Option<(Mark, SyntaxNode)>>, UnresolvedMacro> {
-        let (raw_node, mut advance_state, err) = match self.enter_expand_intern(db, macro_call)? {
-            ExpandResult { value: Some((raw_node, advance_state)), err } => {
-                (raw_node, advance_state, err)
-            }
-            ExpandResult { value: None, err } => return Ok(ExpandResult { value: None, err }),
-        };
-
-        log::debug!("macro expansion {:#?}", raw_node);
-
-        let mark = advance_state(db);
-
-        Ok(ExpandResult { value: Some((mark, raw_node)), err })
-    }
-
-    pub(crate) fn enter_expand<T: ast::AstNode>(
-        &mut self,
-        db: &dyn DefDatabase,
-        macro_call: ast::MacroCall,
-    ) -> Result<ExpandResult<Option<(Mark, T)>>, UnresolvedMacro> {
-        let (raw_node, mut advance_state, err) = match self.enter_expand_intern(db, macro_call)? {
-            ExpandResult { value: Some((raw_node, advance_state)), err } => {
-                (raw_node, advance_state, err)
-            }
-            ExpandResult { value: None, err } => return Ok(ExpandResult { value: None, err }),
-        };
-
         let node = match T::cast(raw_node) {
             Some(it) => it,
             None => {
@@ -209,7 +157,15 @@ impl Expander {
 
         log::debug!("macro expansion {:#?}", node.syntax());
 
-        let mark = advance_state(db);
+        self.recursion_limit += 1;
+        let mark = Mark {
+            file_id: self.current_file_id,
+            ast_id_map: mem::take(&mut self.ast_id_map),
+            bomb: DropBomb::new("expansion mark dropped"),
+        };
+        self.cfg_expander.hygiene = Hygiene::new(db.upcast(), file_id);
+        self.current_file_id = file_id;
+        self.ast_id_map = db.ast_id_map(file_id);
 
         Ok(ExpandResult { value: Some((mark, node)), err })
     }
@@ -234,6 +190,10 @@ impl Expander {
         &self.cfg_expander.cfg_options
     }
 
+    pub(crate) fn current_file_id(&self) -> HirFileId {
+        self.current_file_id
+    }
+
     fn parse_path(&mut self, path: ast::Path) -> Option<Path> {
         let ctx = LowerCtx::with_hygiene(&self.cfg_expander.hygiene);
         Path::from_src(path, &ctx)