diff options
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index 3a3bf6b5f..44a4ddba0 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
@@ -279,10 +279,6 @@ impl CrateDefMap { | |||
279 | self.root | 279 | self.root |
280 | } | 280 | } |
281 | 281 | ||
282 | pub(crate) fn mk_module(&self, module_id: CrateModuleId) -> Module { | ||
283 | Module { krate: self.krate, module_id } | ||
284 | } | ||
285 | |||
286 | pub(crate) fn prelude(&self) -> Option<Module> { | 282 | pub(crate) fn prelude(&self) -> Option<Module> { |
287 | self.prelude | 283 | self.prelude |
288 | } | 284 | } |
@@ -389,7 +385,7 @@ impl CrateDefMap { | |||
389 | }; | 385 | }; |
390 | 386 | ||
391 | for (i, segment) in segments { | 387 | for (i, segment) in segments { |
392 | let curr = match curr_per_ns.as_ref().take_types() { | 388 | let curr = match curr_per_ns.take_types() { |
393 | Some(r) => r, | 389 | Some(r) => r, |
394 | None => { | 390 | None => { |
395 | // we still have path segments left, but the path so far | 391 | // we still have path segments left, but the path so far |
@@ -433,7 +429,7 @@ impl CrateDefMap { | |||
433 | Some(variant) => PerNs::both(variant.into(), variant.into()), | 429 | Some(variant) => PerNs::both(variant.into(), variant.into()), |
434 | None => { | 430 | None => { |
435 | return ResolvePathResult::with( | 431 | return ResolvePathResult::with( |
436 | PerNs::types((*e).into()), | 432 | PerNs::types(e.into()), |
437 | ReachedFixedPoint::Yes, | 433 | ReachedFixedPoint::Yes, |
438 | Some(i), | 434 | Some(i), |
439 | ); | 435 | ); |
@@ -450,7 +446,7 @@ impl CrateDefMap { | |||
450 | ); | 446 | ); |
451 | 447 | ||
452 | return ResolvePathResult::with( | 448 | return ResolvePathResult::with( |
453 | PerNs::types(*s), | 449 | PerNs::types(s), |
454 | ReachedFixedPoint::Yes, | 450 | ReachedFixedPoint::Yes, |
455 | Some(i), | 451 | Some(i), |
456 | ); | 452 | ); |