aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_assists/src/add_missing_impl_members.rs4
-rw-r--r--crates/ra_ide_api/src/call_info.rs6
-rw-r--r--crates/ra_syntax/tests/test.rs2
3 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_assists/src/add_missing_impl_members.rs b/crates/ra_assists/src/add_missing_impl_members.rs
index 04b3f3c76..104a4d78a 100644
--- a/crates/ra_assists/src/add_missing_impl_members.rs
+++ b/crates/ra_assists/src/add_missing_impl_members.rs
@@ -45,9 +45,9 @@ fn add_missing_impl_members_inner(
45 let trait_def = { 45 let trait_def = {
46 let file_id = ctx.frange.file_id; 46 let file_id = ctx.frange.file_id;
47 let position = FilePosition { file_id, offset: impl_node.syntax().range().start() }; 47 let position = FilePosition { file_id, offset: impl_node.syntax().range().start() };
48 let analyser = hir::SourceAnalyzer::new(ctx.db, position.file_id, impl_node.syntax()); 48 let analyzer = hir::SourceAnalyzer::new(ctx.db, position.file_id, impl_node.syntax());
49 49
50 resolve_target_trait_def(ctx.db, &analyser, impl_node)? 50 resolve_target_trait_def(ctx.db, &analyzer, impl_node)?
51 }; 51 };
52 52
53 let missing_fns: Vec<_> = { 53 let missing_fns: Vec<_> = {
diff --git a/crates/ra_ide_api/src/call_info.rs b/crates/ra_ide_api/src/call_info.rs
index a6676cad5..a8495ab01 100644
--- a/crates/ra_ide_api/src/call_info.rs
+++ b/crates/ra_ide_api/src/call_info.rs
@@ -17,19 +17,19 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
17 let calling_node = FnCallNode::with_node(syntax, position.offset)?; 17 let calling_node = FnCallNode::with_node(syntax, position.offset)?;
18 let name_ref = calling_node.name_ref()?; 18 let name_ref = calling_node.name_ref()?;
19 19
20 let analyser = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax()); 20 let analyzer = hir::SourceAnalyzer::new(db, position.file_id, name_ref.syntax());
21 let function = match calling_node { 21 let function = match calling_node {
22 FnCallNode::CallExpr(expr) => { 22 FnCallNode::CallExpr(expr) => {
23 //FIXME: apply subst 23 //FIXME: apply subst
24 let (callable_def, _subst) = 24 let (callable_def, _subst) =
25 analyser.type_of(db, expr.expr()?.into())?.as_callable()?; 25 analyzer.type_of(db, expr.expr()?.into())?.as_callable()?;
26 match callable_def { 26 match callable_def {
27 hir::CallableDef::Function(it) => it, 27 hir::CallableDef::Function(it) => it,
28 //FIXME: handle other callables 28 //FIXME: handle other callables
29 _ => return None, 29 _ => return None,
30 } 30 }
31 } 31 }
32 FnCallNode::MethodCallExpr(expr) => analyser.resolve_method_call(expr)?, 32 FnCallNode::MethodCallExpr(expr) => analyzer.resolve_method_call(expr)?,
33 }; 33 };
34 34
35 let mut call_info = CallInfo::new(db, function); 35 let mut call_info = CallInfo::new(db, function);
diff --git a/crates/ra_syntax/tests/test.rs b/crates/ra_syntax/tests/test.rs
index 276756c85..91799f8b5 100644
--- a/crates/ra_syntax/tests/test.rs
+++ b/crates/ra_syntax/tests/test.rs
@@ -60,7 +60,7 @@ fn reparse_fuzz_tests() {
60 } 60 }
61} 61}
62 62
63/// Test that Rust-analyzer can parse and validate the rust-analyser 63/// Test that Rust-analyzer can parse and validate the rust-analyzer
64/// FIXME: Use this as a benchmark 64/// FIXME: Use this as a benchmark
65#[test] 65#[test]
66fn self_hosting_parsing() { 66fn self_hosting_parsing() {