aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis/src/goto_defenition.rs
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-01-08 09:05:55 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-01-08 09:05:55 +0000
commit3f4be819125ce4a22edd86721fa56b5caba99c2e (patch)
treebe93895ddc08c911585d9f7bc64623a3741f32c6 /crates/ra_analysis/src/goto_defenition.rs
parent4e444d2bc24d16284401444fd2154f63e0f96070 (diff)
parent122410d7aa34a32d468a3173858cbc8a2bbc68f5 (diff)
Merge #449
449: switch to new rowan API r=matklad a=matklad closes https://github.com/rust-analyzer/rust-analyzer/issues/448 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/goto_defenition.rs')
-rw-r--r--crates/ra_analysis/src/goto_defenition.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/goto_defenition.rs b/crates/ra_analysis/src/goto_defenition.rs
index aa0616e3b..0bcf13ebd 100644
--- a/crates/ra_analysis/src/goto_defenition.rs
+++ b/crates/ra_analysis/src/goto_defenition.rs
@@ -23,7 +23,7 @@ pub(crate) fn goto_defenition(
23pub(crate) fn reference_defenition( 23pub(crate) fn reference_defenition(
24 db: &RootDatabase, 24 db: &RootDatabase,
25 file_id: FileId, 25 file_id: FileId,
26 name_ref: ast::NameRef, 26 name_ref: &ast::NameRef,
27) -> Cancelable<Vec<NavigationTarget>> { 27) -> Cancelable<Vec<NavigationTarget>> {
28 if let Some(fn_descr) = 28 if let Some(fn_descr) =
29 hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax())? 29 hir::source_binder::function_from_child_node(db, file_id, name_ref.syntax())?
@@ -53,7 +53,7 @@ pub(crate) fn reference_defenition(
53fn name_defenition( 53fn name_defenition(
54 db: &RootDatabase, 54 db: &RootDatabase,
55 file_id: FileId, 55 file_id: FileId,
56 name: ast::Name, 56 name: &ast::Name,
57) -> Cancelable<Option<Vec<NavigationTarget>>> { 57) -> Cancelable<Option<Vec<NavigationTarget>>> {
58 if let Some(module) = name.syntax().parent().and_then(ast::Module::cast) { 58 if let Some(module) = name.syntax().parent().and_then(ast::Module::cast) {
59 if module.has_semi() { 59 if module.has_semi() {