diff options
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index b325979f5..39f585b44 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
@@ -48,7 +48,6 @@ | |||
48 | //! on the result | 48 | //! on the result |
49 | 49 | ||
50 | mod per_ns; | 50 | mod per_ns; |
51 | mod raw; | ||
52 | mod collector; | 51 | mod collector; |
53 | mod mod_resolution; | 52 | mod mod_resolution; |
54 | #[cfg(test)] | 53 | #[cfg(test)] |
@@ -74,12 +73,9 @@ use crate::{ | |||
74 | Trait, | 73 | Trait, |
75 | }; | 74 | }; |
76 | 75 | ||
77 | pub(crate) use self::raw::{ImportSourceMap, RawItems}; | 76 | pub use self::per_ns::{Namespace, PerNs}; |
78 | 77 | ||
79 | pub use self::{ | 78 | pub use hir_def::nameres::raw::ImportId; |
80 | per_ns::{Namespace, PerNs}, | ||
81 | raw::ImportId, | ||
82 | }; | ||
83 | 79 | ||
84 | /// Contains all top-level defs from a macro-expanded crate | 80 | /// Contains all top-level defs from a macro-expanded crate |
85 | #[derive(Debug, PartialEq, Eq)] | 81 | #[derive(Debug, PartialEq, Eq)] |
@@ -328,7 +324,8 @@ impl CrateDefMap { | |||
328 | ) -> ResolvePathResult { | 324 | ) -> ResolvePathResult { |
329 | let mut segments = path.segments.iter().enumerate(); | 325 | let mut segments = path.segments.iter().enumerate(); |
330 | let mut curr_per_ns: PerNs = match path.kind { | 326 | let mut curr_per_ns: PerNs = match path.kind { |
331 | PathKind::DollarCrate(krate) => { | 327 | PathKind::DollarCrate(crate_id) => { |
328 | let krate = Crate { crate_id }; | ||
332 | if krate == self.krate { | 329 | if krate == self.krate { |
333 | tested_by!(macro_dollar_crate_self); | 330 | tested_by!(macro_dollar_crate_self); |
334 | PerNs::types(Module::new(self.krate, self.root).into()) | 331 | PerNs::types(Module::new(self.krate, self.root).into()) |