From 45112aa8c0a55f003acc3b20646e840909dea08f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 24 May 2021 22:21:25 +0300 Subject: internal: rename hypothetical -> speculative Lets steal this good naming from Roslyn before I forget about it yet again. --- crates/hir/src/semantics.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/hir/src') diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index 3aa467e3c..8d3c43d08 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs @@ -120,10 +120,10 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> { pub fn speculative_expand( &self, actual_macro_call: &ast::MacroCall, - hypothetical_args: &ast::TokenTree, + speculative_args: &ast::TokenTree, token_to_map: SyntaxToken, ) -> Option<(SyntaxNode, SyntaxToken)> { - self.imp.speculative_expand(actual_macro_call, hypothetical_args, token_to_map) + self.imp.speculative_expand(actual_macro_call, speculative_args, token_to_map) } pub fn descend_into_macros(&self, token: SyntaxToken) -> SyntaxToken { @@ -335,7 +335,7 @@ impl<'db> SemanticsImpl<'db> { fn speculative_expand( &self, actual_macro_call: &ast::MacroCall, - hypothetical_args: &ast::TokenTree, + speculative_args: &ast::TokenTree, token_to_map: SyntaxToken, ) -> Option<(SyntaxNode, SyntaxToken)> { let sa = self.analyze(actual_macro_call.syntax()); @@ -344,10 +344,10 @@ impl<'db> SemanticsImpl<'db> { let macro_call_id = macro_call.as_call_id(self.db.upcast(), krate, |path| { sa.resolver.resolve_path_as_macro(self.db.upcast(), &path) })?; - hir_expand::db::expand_hypothetical( + hir_expand::db::expand_speculative( self.db.upcast(), macro_call_id, - hypothetical_args, + speculative_args, token_to_map, ) } -- cgit v1.2.3