diff options
author | Aleksey Kladov <[email protected]> | 2018-11-27 18:45:42 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-11-27 18:45:42 +0000 |
commit | d659b7a2f03788eb0f4f15e3730bbf65a18ed818 (patch) | |
tree | c7112f1e0785606ab67b3df8d7a8b411909f54e1 /crates/ra_analysis/src/imp.rs | |
parent | 9f08341aa486ea59cb488635f19e960523568fb8 (diff) |
start descriptors -> hir rename
Diffstat (limited to 'crates/ra_analysis/src/imp.rs')
-rw-r--r-- | crates/ra_analysis/src/imp.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index 8a41b3152..8d60f9af7 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs | |||
@@ -19,7 +19,7 @@ use salsa::{Database, ParallelDatabase}; | |||
19 | use crate::{ | 19 | use crate::{ |
20 | completion::{completions, CompletionItem}, | 20 | completion::{completions, CompletionItem}, |
21 | db::{self, FileSyntaxQuery, SyntaxDatabase}, | 21 | db::{self, FileSyntaxQuery, SyntaxDatabase}, |
22 | descriptors::{ | 22 | hir::{ |
23 | function::{FnDescriptor, FnId}, | 23 | function::{FnDescriptor, FnId}, |
24 | module::{ModuleDescriptor, Problem}, | 24 | module::{ModuleDescriptor, Problem}, |
25 | DeclarationDescriptor, DescriptorDatabase, | 25 | DeclarationDescriptor, DescriptorDatabase, |
@@ -589,7 +589,7 @@ fn resolve_local_name( | |||
589 | let fn_def = name_ref.syntax().ancestors().find_map(ast::FnDef::cast)?; | 589 | let fn_def = name_ref.syntax().ancestors().find_map(ast::FnDef::cast)?; |
590 | let fn_id = FnId::get(db, file_id, fn_def); | 590 | let fn_id = FnId::get(db, file_id, fn_def); |
591 | let scopes = db.fn_scopes(fn_id); | 591 | let scopes = db.fn_scopes(fn_id); |
592 | let scope_entry = crate::descriptors::function::resolve_local_name(name_ref, &scopes)?; | 592 | let scope_entry = crate::hir::function::resolve_local_name(name_ref, &scopes)?; |
593 | let syntax = db.resolve_syntax_ptr(scope_entry.ptr().into_global(file_id)); | 593 | let syntax = db.resolve_syntax_ptr(scope_entry.ptr().into_global(file_id)); |
594 | Some((scope_entry.name().clone(), syntax.range())) | 594 | Some((scope_entry.name().clone(), syntax.range())) |
595 | } | 595 | } |