Unnamed repository; edit this file 'description' to name the repository.
reduce uses of `hir_expand::db::expand_speculative`
| -rw-r--r-- | crates/hir/src/semantics.rs | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index bd2c84bb55..76cf14227d 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs @@ -739,12 +739,7 @@ impl<'db> SemanticsImpl<'db> { token_to_map: SyntaxToken, ) -> Option<(SyntaxNode, Vec<(SyntaxToken, u8)>)> { let macro_file = self.to_def(actual_macro_call)?; - hir_expand::db::expand_speculative( - self.db, - macro_file, - speculative_args.syntax(), - token_to_map, - ) + self.speculative_expand_raw(macro_file, speculative_args.syntax(), token_to_map) } pub fn speculative_expand_raw( @@ -766,12 +761,7 @@ impl<'db> SemanticsImpl<'db> { ) -> Option<(SyntaxNode, Vec<(SyntaxToken, u8)>)> { let macro_call = self.wrap_node_infile(actual_macro_call.clone()); let macro_call_id = self.with_ctx(|ctx| ctx.item_to_macro_call(macro_call.as_ref()))?; - hir_expand::db::expand_speculative( - self.db, - macro_call_id, - speculative_args.syntax(), - token_to_map, - ) + self.speculative_expand_raw(macro_call_id, speculative_args.syntax(), token_to_map) } pub fn speculative_expand_derive_as_pseudo_attr_macro( @@ -789,12 +779,7 @@ impl<'db> SemanticsImpl<'db> { ) .map(|(_, it, _)| it) })?; - hir_expand::db::expand_speculative( - self.db, - macro_call_id, - speculative_args.syntax(), - token_to_map, - ) + self.speculative_expand_raw(macro_call_id, speculative_args.syntax(), token_to_map) } /// Checks if renaming `renamed` to `new_name` may introduce conflicts with other locals, |