aboutsummaryrefslogtreecommitdiff
path: root/crates/hir/src
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-08-14 14:23:27 +0100
committerAleksey Kladov <[email protected]>2020-08-14 14:23:27 +0100
commit125744c057a953b2f1b03042e9a6ec49f1eb0a1e (patch)
tree39cadc001951e59dca1ec17697a8507e438d4791 /crates/hir/src
parent1ec23e7d33e29c6e14f4fe504e1e253e91339ea4 (diff)
Rename hypothetical -> speculative
Diffstat (limited to 'crates/hir/src')
-rw-r--r--crates/hir/src/semantics.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
index d8beac98a..3953017c3 100644
--- a/crates/hir/src/semantics.rs
+++ b/crates/hir/src/semantics.rs
@@ -112,14 +112,13 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
112 pub fn expand(&self, macro_call: &ast::MacroCall) -> Option<SyntaxNode> { 112 pub fn expand(&self, macro_call: &ast::MacroCall) -> Option<SyntaxNode> {
113 self.imp.expand(macro_call) 113 self.imp.expand(macro_call)
114 } 114 }
115 115 pub fn speculative_expand(
116 pub fn expand_hypothetical(
117 &self, 116 &self,
118 actual_macro_call: &ast::MacroCall, 117 actual_macro_call: &ast::MacroCall,
119 hypothetical_args: &ast::TokenTree, 118 hypothetical_args: &ast::TokenTree,
120 token_to_map: SyntaxToken, 119 token_to_map: SyntaxToken,
121 ) -> Option<(SyntaxNode, SyntaxToken)> { 120 ) -> Option<(SyntaxNode, SyntaxToken)> {
122 self.imp.expand_hypothetical(actual_macro_call, hypothetical_args, token_to_map) 121 self.imp.speculative_expand(actual_macro_call, hypothetical_args, token_to_map)
123 } 122 }
124 123
125 pub fn descend_into_macros(&self, token: SyntaxToken) -> SyntaxToken { 124 pub fn descend_into_macros(&self, token: SyntaxToken) -> SyntaxToken {
@@ -311,7 +310,7 @@ impl<'db> SemanticsImpl<'db> {
311 Some(node) 310 Some(node)
312 } 311 }
313 312
314 fn expand_hypothetical( 313 fn speculative_expand(
315 &self, 314 &self,
316 actual_macro_call: &ast::MacroCall, 315 actual_macro_call: &ast::MacroCall,
317 hypothetical_args: &ast::TokenTree, 316 hypothetical_args: &ast::TokenTree,
@@ -756,7 +755,7 @@ impl<'a> SemanticsScope<'a> {
756 755
757 /// Resolve a path as-if it was written at the given scope. This is 756 /// Resolve a path as-if it was written at the given scope. This is
758 /// necessary a heuristic, as it doesn't take hygiene into account. 757 /// necessary a heuristic, as it doesn't take hygiene into account.
759 pub fn resolve_hypothetical(&self, path: &ast::Path) -> Option<PathResolution> { 758 pub fn speculative_resolve(&self, path: &ast::Path) -> Option<PathResolution> {
760 let hygiene = Hygiene::new(self.db.upcast(), self.file_id); 759 let hygiene = Hygiene::new(self.db.upcast(), self.file_id);
761 let path = Path::from_src(path.clone(), &hygiene)?; 760 let path = Path::from_src(path.clone(), &hygiene)?;
762 self.resolve_hir_path(&path) 761 self.resolve_hir_path(&path)