diff options
author | Aleksey Kladov <[email protected]> | 2019-11-21 10:32:03 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-11-21 10:48:05 +0000 |
commit | 621cf06156975f8bd75e35af46da034f72e11fad (patch) | |
tree | f06e26fc377bd36961a5c8fb41e01423e4e1a01d /crates/ra_hir/src/source_binder.rs | |
parent | 24964ca58e057b3f32d5cbb17d84e46f2a236ff6 (diff) |
Decouple
Diffstat (limited to 'crates/ra_hir/src/source_binder.rs')
-rw-r--r-- | crates/ra_hir/src/source_binder.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index 29c928d51..09df4f0aa 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs | |||
@@ -160,7 +160,7 @@ impl SourceAnalyzer { | |||
160 | None => scope_for(&scopes, &source_map, node), | 160 | None => scope_for(&scopes, &source_map, node), |
161 | Some(offset) => scope_for_offset(&scopes, &source_map, node.with_value(offset)), | 161 | Some(offset) => scope_for_offset(&scopes, &source_map, node.with_value(offset)), |
162 | }; | 162 | }; |
163 | let resolver = resolver_for_scope(db, def, scope); | 163 | let resolver = resolver_for_scope(db, def.into(), scope); |
164 | SourceAnalyzer { | 164 | SourceAnalyzer { |
165 | resolver, | 165 | resolver, |
166 | body_owner: Some(def), | 166 | body_owner: Some(def), |
@@ -260,11 +260,11 @@ impl SourceAnalyzer { | |||
260 | let var = Local { parent: self.body_owner?, pat_id }; | 260 | let var = Local { parent: self.body_owner?, pat_id }; |
261 | PathResolution::Local(var) | 261 | PathResolution::Local(var) |
262 | } | 262 | } |
263 | ValueNs::Function(it) => PathResolution::Def(it.into()), | 263 | ValueNs::FunctionId(it) => PathResolution::Def(Function::from(it).into()), |
264 | ValueNs::Const(it) => PathResolution::Def(it.into()), | 264 | ValueNs::ConstId(it) => PathResolution::Def(Const::from(it).into()), |
265 | ValueNs::Static(it) => PathResolution::Def(it.into()), | 265 | ValueNs::StaticId(it) => PathResolution::Def(Static::from(it).into()), |
266 | ValueNs::Struct(it) => PathResolution::Def(it.into()), | 266 | ValueNs::StructId(it) => PathResolution::Def(Struct::from(it).into()), |
267 | ValueNs::EnumVariant(it) => PathResolution::Def(it.into()), | 267 | ValueNs::EnumVariantId(it) => PathResolution::Def(EnumVariant::from(it).into()), |
268 | }; | 268 | }; |
269 | Some(res) | 269 | Some(res) |
270 | }); | 270 | }); |