aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/resolve.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-09-13 14:38:59 +0100
committerAleksey Kladov <[email protected]>2019-09-13 14:38:59 +0100
commit2fbe79ed9adaeb93e0c9b8bc1d7f67dff075b8dd (patch)
tree319ebb277cb714e2dd648b9e1c38477ffb0a2dcf /crates/ra_hir/src/resolve.rs
parent51e2d76b9839410020c75ac02ad602675b0a5aa9 (diff)
make PerNs non-generic
Diffstat (limited to 'crates/ra_hir/src/resolve.rs')
-rw-r--r--crates/ra_hir/src/resolve.rs10
1 files changed, 3 insertions, 7 deletions
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index d841593f8..3207b6626 100644
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -112,11 +112,7 @@ impl Resolver {
112 } 112 }
113 113
114 /// pub only for source-binder 114 /// pub only for source-binder
115 pub(crate) fn resolve_module_path( 115 pub(crate) fn resolve_module_path(&self, db: &impl HirDatabase, path: &Path) -> PerNs {
116 &self,
117 db: &impl HirDatabase,
118 path: &Path,
119 ) -> PerNs<ModuleDef> {
120 let (item_map, module) = match self.module() { 116 let (item_map, module) = match self.module() {
121 Some(it) => it, 117 Some(it) => it,
122 None => return PerNs::none(), 118 None => return PerNs::none(),
@@ -385,8 +381,8 @@ pub enum ScopeDef {
385 Unknown, 381 Unknown,
386} 382}
387 383
388impl From<PerNs<ModuleDef>> for ScopeDef { 384impl From<PerNs> for ScopeDef {
389 fn from(def: PerNs<ModuleDef>) -> Self { 385 fn from(def: PerNs) -> Self {
390 def.take_types() 386 def.take_types()
391 .or_else(|| def.take_values()) 387 .or_else(|| def.take_values())
392 .map(ScopeDef::ModuleDef) 388 .map(ScopeDef::ModuleDef)