aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/nameres/raw.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir/src/nameres/raw.rs')
-rw-r--r--crates/ra_hir/src/nameres/raw.rs22
1 files changed, 3 insertions, 19 deletions
diff --git a/crates/ra_hir/src/nameres/raw.rs b/crates/ra_hir/src/nameres/raw.rs
index 469fd8ea7..57f2929c3 100644
--- a/crates/ra_hir/src/nameres/raw.rs
+++ b/crates/ra_hir/src/nameres/raw.rs
@@ -149,17 +149,8 @@ impl_arena_id!(Module);
149 149
150#[derive(Debug, PartialEq, Eq)] 150#[derive(Debug, PartialEq, Eq)]
151pub(super) enum ModuleData { 151pub(super) enum ModuleData {
152 Declaration { 152 Declaration { name: Name, ast_id: FileAstId<ast::Module> },
153 name: Name, 153 Definition { name: Name, ast_id: FileAstId<ast::Module>, items: Vec<RawItem> },
154 ast_id: FileAstId<ast::Module>,
155 is_macro_use: bool,
156 },
157 Definition {
158 name: Name,
159 ast_id: FileAstId<ast::Module>,
160 items: Vec<RawItem>,
161 is_macro_use: bool,
162 },
163} 154}
164 155
165#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 156#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -290,14 +281,8 @@ impl<DB: AstDatabase> RawItemsCollector<&DB> {
290 let attrs = self.parse_attrs(&module); 281 let attrs = self.parse_attrs(&module);
291 282
292 let ast_id = self.source_ast_id_map.ast_id(&module); 283 let ast_id = self.source_ast_id_map.ast_id(&module);
293 // FIXME: cfg_attr
294 let is_macro_use = module.has_atom_attr("macro_use");
295 if module.has_semi() { 284 if module.has_semi() {
296 let item = self.raw_items.modules.alloc(ModuleData::Declaration { 285 let item = self.raw_items.modules.alloc(ModuleData::Declaration { name, ast_id });
297 name,
298 ast_id,
299 is_macro_use,
300 });
301 self.push_item(current_module, attrs, RawItemKind::Module(item)); 286 self.push_item(current_module, attrs, RawItemKind::Module(item));
302 return; 287 return;
303 } 288 }
@@ -307,7 +292,6 @@ impl<DB: AstDatabase> RawItemsCollector<&DB> {
307 name, 292 name,
308 ast_id, 293 ast_id,
309 items: Vec::new(), 294 items: Vec::new(),
310 is_macro_use,
311 }); 295 });
312 self.process_module(Some(item), item_list); 296 self.process_module(Some(item), item_list);
313 self.push_item(current_module, attrs, RawItemKind::Module(item)); 297 self.push_item(current_module, attrs, RawItemKind::Module(item));