diff options
author | Aleksey Kladov <[email protected]> | 2018-10-31 12:13:49 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-10-31 12:13:49 +0000 |
commit | c02be1502c76cc504ccf7f73dce929585c94377c (patch) | |
tree | af21ab880f246e50209789614b45248d1f27ddd3 /crates/ra_analysis/src/descriptors | |
parent | b67295134bf5c518b39bc88abbe1bc5b9d7d3baf (diff) |
move resolve local name
Diffstat (limited to 'crates/ra_analysis/src/descriptors')
-rw-r--r-- | crates/ra_analysis/src/descriptors/function/mod.rs | 2 | ||||
-rw-r--r-- | crates/ra_analysis/src/descriptors/function/scope.rs | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/crates/ra_analysis/src/descriptors/function/mod.rs b/crates/ra_analysis/src/descriptors/function/mod.rs index 687413ddc..bb68b0ce7 100644 --- a/crates/ra_analysis/src/descriptors/function/mod.rs +++ b/crates/ra_analysis/src/descriptors/function/mod.rs | |||
@@ -10,7 +10,7 @@ use crate::{ | |||
10 | syntax_ptr::SyntaxPtr | 10 | syntax_ptr::SyntaxPtr |
11 | }; | 11 | }; |
12 | 12 | ||
13 | pub(crate) use self::scope::FnScopes; | 13 | pub(crate) use self::scope::{FnScopes, resolve_local_name}; |
14 | 14 | ||
15 | 15 | ||
16 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 16 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
diff --git a/crates/ra_analysis/src/descriptors/function/scope.rs b/crates/ra_analysis/src/descriptors/function/scope.rs index 5333a0a3b..d9929414c 100644 --- a/crates/ra_analysis/src/descriptors/function/scope.rs +++ b/crates/ra_analysis/src/descriptors/function/scope.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | use rustc_hash::FxHashMap; | 1 | use rustc_hash::{FxHashMap, FxHashSet}; |
2 | 2 | ||
3 | use ra_syntax::{ | 3 | use ra_syntax::{ |
4 | algo::generate, | 4 | algo::generate, |
@@ -261,8 +261,6 @@ pub fn resolve_local_name<'a>( | |||
261 | name_ref: ast::NameRef, | 261 | name_ref: ast::NameRef, |
262 | scopes: &'a FnScopes, | 262 | scopes: &'a FnScopes, |
263 | ) -> Option<&'a ScopeEntry> { | 263 | ) -> Option<&'a ScopeEntry> { |
264 | use rustc_hash::FxHashSet; | ||
265 | |||
266 | let mut shadowed = FxHashSet::default(); | 264 | let mut shadowed = FxHashSet::default(); |
267 | let ret = scopes | 265 | let ret = scopes |
268 | .scope_chain(name_ref.syntax()) | 266 | .scope_chain(name_ref.syntax()) |