diff options
author | Muhammad Mominul Huque <[email protected]> | 2019-07-07 22:29:38 +0100 |
---|---|---|
committer | Muhammad Mominul Huque <[email protected]> | 2019-07-07 22:29:38 +0100 |
commit | 012fec54dc508896493d5d3073b4786c93d66fe9 (patch) | |
tree | e2cd7f786de128b0d0503dcd3931212ee37220b3 /crates/ra_hir/src/resolve.rs | |
parent | 1b38ca3b8739230af1cc69884b5b11650b5fcb46 (diff) |
Constify KnownName's
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r-- | crates/ra_hir/src/resolve.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index e2a7639b0..ef75308f6 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs | |||
@@ -13,7 +13,7 @@ use crate::{ | |||
13 | }, | 13 | }, |
14 | generics::GenericParams, | 14 | generics::GenericParams, |
15 | impl_block::ImplBlock, | 15 | impl_block::ImplBlock, |
16 | name::{KnownName, Name}, | 16 | name::{Name, SELF_PARAM, SELF_TYPE}, |
17 | nameres::{CrateDefMap, CrateModuleId, PerNs}, | 17 | nameres::{CrateDefMap, CrateModuleId, PerNs}, |
18 | path::Path, | 18 | path::Path, |
19 | MacroDef, ModuleDef, Trait, | 19 | MacroDef, ModuleDef, Trait, |
@@ -151,7 +151,7 @@ impl Resolver { | |||
151 | if let Some(name) = path.as_ident() { | 151 | if let Some(name) = path.as_ident() { |
152 | PathResult::from_resolution(self.resolve_name(db, name)) | 152 | PathResult::from_resolution(self.resolve_name(db, name)) |
153 | } else if path.is_self() { | 153 | } else if path.is_self() { |
154 | PathResult::from_resolution(self.resolve_name(db, &Name::self_param())) | 154 | PathResult::from_resolution(self.resolve_name(db, &SELF_PARAM)) |
155 | } else { | 155 | } else { |
156 | let (item_map, module) = match self.module() { | 156 | let (item_map, module) = match self.module() { |
157 | Some(it) => it, | 157 | Some(it) => it, |
@@ -270,7 +270,7 @@ impl Scope { | |||
270 | fn resolve_name(&self, db: &impl HirDatabase, name: &Name) -> PerNs<Resolution> { | 270 | fn resolve_name(&self, db: &impl HirDatabase, name: &Name) -> PerNs<Resolution> { |
271 | match self { | 271 | match self { |
272 | Scope::ModuleScope(m) => { | 272 | Scope::ModuleScope(m) => { |
273 | if let Some(KnownName::SelfParam) = name.as_known_name() { | 273 | if name == &SELF_PARAM { |
274 | PerNs::types(Resolution::Def(m.crate_def_map.mk_module(m.module_id).into())) | 274 | PerNs::types(Resolution::Def(m.crate_def_map.mk_module(m.module_id).into())) |
275 | } else { | 275 | } else { |
276 | m.crate_def_map | 276 | m.crate_def_map |
@@ -283,7 +283,7 @@ impl Scope { | |||
283 | None => PerNs::none(), | 283 | None => PerNs::none(), |
284 | }, | 284 | }, |
285 | Scope::ImplBlockScope(i) => { | 285 | Scope::ImplBlockScope(i) => { |
286 | if name.as_known_name() == Some(KnownName::SelfType) { | 286 | if name == &SELF_TYPE { |
287 | PerNs::types(Resolution::SelfType(*i)) | 287 | PerNs::types(Resolution::SelfType(*i)) |
288 | } else { | 288 | } else { |
289 | PerNs::none() | 289 | PerNs::none() |
@@ -329,7 +329,7 @@ impl Scope { | |||
329 | } | 329 | } |
330 | } | 330 | } |
331 | Scope::ImplBlockScope(i) => { | 331 | Scope::ImplBlockScope(i) => { |
332 | f(Name::self_type(), PerNs::types(Resolution::SelfType(*i))); | 332 | f(SELF_TYPE, PerNs::types(Resolution::SelfType(*i))); |
333 | } | 333 | } |
334 | Scope::ExprScope(e) => { | 334 | Scope::ExprScope(e) => { |
335 | e.expr_scopes.entries(e.scope_id).iter().for_each(|e| { | 335 | e.expr_scopes.entries(e.scope_id).iter().for_each(|e| { |