diff options
Diffstat (limited to 'crates/ra_hir_def/src/nameres.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index b3e5f491a..b279bdeef 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs | |||
@@ -47,7 +47,6 @@ | |||
47 | //! path and, upon success, we run macro expansion and "collect module" phase on | 47 | //! path and, upon success, we run macro expansion and "collect module" phase on |
48 | //! the result | 48 | //! the result |
49 | 49 | ||
50 | pub(crate) mod raw; | ||
51 | mod collector; | 50 | mod collector; |
52 | mod mod_resolution; | 51 | mod mod_resolution; |
53 | mod path_resolution; | 52 | mod path_resolution; |
@@ -104,6 +103,7 @@ pub enum ModuleOrigin { | |||
104 | }, | 103 | }, |
105 | /// Note that non-inline modules, by definition, live inside non-macro file. | 104 | /// Note that non-inline modules, by definition, live inside non-macro file. |
106 | File { | 105 | File { |
106 | is_mod_rs: bool, | ||
107 | declaration: AstId<ast::Module>, | 107 | declaration: AstId<ast::Module>, |
108 | definition: FileId, | 108 | definition: FileId, |
109 | }, | 109 | }, |
@@ -119,13 +119,6 @@ impl Default for ModuleOrigin { | |||
119 | } | 119 | } |
120 | 120 | ||
121 | impl ModuleOrigin { | 121 | impl ModuleOrigin { |
122 | pub(crate) fn not_sure_file(file: Option<FileId>, declaration: AstId<ast::Module>) -> Self { | ||
123 | match file { | ||
124 | None => ModuleOrigin::Inline { definition: declaration }, | ||
125 | Some(definition) => ModuleOrigin::File { declaration, definition }, | ||
126 | } | ||
127 | } | ||
128 | |||
129 | fn declaration(&self) -> Option<AstId<ast::Module>> { | 122 | fn declaration(&self) -> Option<AstId<ast::Module>> { |
130 | match self { | 123 | match self { |
131 | ModuleOrigin::File { declaration: module, .. } | 124 | ModuleOrigin::File { declaration: module, .. } |