From 617cd7231c1aee5d7ca04892c6983c009b5ee60c Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Mon, 19 Apr 2021 19:28:41 +0200 Subject: Remove SyntaxRewriter usage in eager::eager_macro_recur --- crates/hir_expand/src/eager.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/hir_expand/src/eager.rs b/crates/hir_expand/src/eager.rs index ef126e4ad..f413a63f7 100644 --- a/crates/hir_expand/src/eager.rs +++ b/crates/hir_expand/src/eager.rs @@ -29,7 +29,7 @@ use base_db::CrateId; use mbe::ExpandResult; use parser::FragmentKind; use std::sync::Arc; -use syntax::{algo::SyntaxRewriter, SyntaxNode}; +use syntax::{ted, SyntaxNode}; pub struct ErrorEmitted { _private: (), @@ -191,10 +191,10 @@ fn eager_macro_recur( macro_resolver: &dyn Fn(ast::Path) -> Option, mut diagnostic_sink: &mut dyn FnMut(mbe::ExpandError), ) -> Result { - let original = curr.value.clone(); + let original = curr.value.clone().clone_for_update(); - let children = curr.value.descendants().filter_map(ast::MacroCall::cast); - let mut rewriter = SyntaxRewriter::default(); + let children = original.descendants().filter_map(ast::MacroCall::cast); + let mut replacements = Vec::new(); // Collect replacement for child in children { @@ -213,6 +213,7 @@ fn eager_macro_recur( .into(); db.parse_or_expand(id.as_file()) .expect("successful macro expansion should be parseable") + .clone_for_update() } MacroDefKind::Declarative(_) | MacroDefKind::BuiltIn(..) @@ -226,15 +227,14 @@ fn eager_macro_recur( } }; - // check if the whole original sytnax is replaced - // Note that SyntaxRewriter cannot replace the root node itself + // check if the whole original syntax is replaced if child.syntax() == &original { return Ok(insert); } - rewriter.replace(child.syntax(), &insert); + replacements.push((child, insert)); } - let res = rewriter.rewrite(&original); - Ok(res) + replacements.into_iter().rev().for_each(|(old, new)| ted::replace(old.syntax(), new)); + Ok(original) } -- cgit v1.2.3