diff options
author | Aleksey Kladov <[email protected]> | 2019-11-03 20:44:23 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-11-03 20:44:23 +0000 |
commit | 73fcf9a2d6ae14afa4e822370c0a46bf1d336081 (patch) | |
tree | 9d2d21a17bdebea9301ac66897f839160c0142fa /crates/ra_hir_def/src/nameres/collector.rs | |
parent | 6fba51c5fc05264abcbf971dcf28142746588d74 (diff) |
Restore crate_def_map marks
Diffstat (limited to 'crates/ra_hir_def/src/nameres/collector.rs')
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 0bc36910c..3b61d9895 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -8,7 +8,7 @@ use ra_cfg::CfgOptions; | |||
8 | use ra_db::{CrateId, FileId}; | 8 | use ra_db::{CrateId, FileId}; |
9 | use ra_syntax::{ast, SmolStr}; | 9 | use ra_syntax::{ast, SmolStr}; |
10 | use rustc_hash::FxHashMap; | 10 | use rustc_hash::FxHashMap; |
11 | // use test_utils::tested_by; | 11 | use test_utils::tested_by; |
12 | 12 | ||
13 | use crate::{ | 13 | use crate::{ |
14 | attr::Attr, | 14 | attr::Attr, |
@@ -218,7 +218,7 @@ where | |||
218 | ); | 218 | ); |
219 | 219 | ||
220 | if let Some(ModuleDefId::ModuleId(m)) = res.take_types() { | 220 | if let Some(ModuleDefId::ModuleId(m)) = res.take_types() { |
221 | // tested_by!(macro_rules_from_other_crates_are_visible_with_macro_use); | 221 | tested_by!(macro_rules_from_other_crates_are_visible_with_macro_use); |
222 | self.import_all_macros_exported(current_module_id, m.krate); | 222 | self.import_all_macros_exported(current_module_id, m.krate); |
223 | } | 223 | } |
224 | } | 224 | } |
@@ -294,10 +294,10 @@ where | |||
294 | match def.take_types() { | 294 | match def.take_types() { |
295 | Some(ModuleDefId::ModuleId(m)) => { | 295 | Some(ModuleDefId::ModuleId(m)) => { |
296 | if import.is_prelude { | 296 | if import.is_prelude { |
297 | // tested_by!(std_prelude); | 297 | tested_by!(std_prelude); |
298 | self.def_map.prelude = Some(m); | 298 | self.def_map.prelude = Some(m); |
299 | } else if m.krate != self.def_map.krate { | 299 | } else if m.krate != self.def_map.krate { |
300 | // tested_by!(glob_across_crates); | 300 | tested_by!(glob_across_crates); |
301 | // glob import from other crate => we can just import everything once | 301 | // glob import from other crate => we can just import everything once |
302 | let item_map = self.db.crate_def_map(m.krate); | 302 | let item_map = self.db.crate_def_map(m.krate); |
303 | let scope = &item_map[m.module_id].scope; | 303 | let scope = &item_map[m.module_id].scope; |
@@ -332,7 +332,7 @@ where | |||
332 | } | 332 | } |
333 | } | 333 | } |
334 | Some(ModuleDefId::AdtId(AdtId::EnumId(e))) => { | 334 | Some(ModuleDefId::AdtId(AdtId::EnumId(e))) => { |
335 | // tested_by!(glob_enum); | 335 | tested_by!(glob_enum); |
336 | // glob import from enum => just import all the variants | 336 | // glob import from enum => just import all the variants |
337 | let enum_data = self.db.enum_data(e); | 337 | let enum_data = self.db.enum_data(e); |
338 | let resolutions = enum_data | 338 | let resolutions = enum_data |
@@ -373,8 +373,7 @@ where | |||
373 | let resolution = Resolution { def, import: Some(import_id) }; | 373 | let resolution = Resolution { def, import: Some(import_id) }; |
374 | self.update(module_id, Some(import_id), &[(name, resolution)]); | 374 | self.update(module_id, Some(import_id), &[(name, resolution)]); |
375 | } | 375 | } |
376 | // tested_by!(bogus_paths), | 376 | None => tested_by!(bogus_paths), |
377 | None => (), | ||
378 | } | 377 | } |
379 | } | 378 | } |
380 | } | 379 | } |
@@ -534,7 +533,7 @@ where | |||
534 | // Prelude module is always considered to be `#[macro_use]`. | 533 | // Prelude module is always considered to be `#[macro_use]`. |
535 | if let Some(prelude_module) = self.def_collector.def_map.prelude { | 534 | if let Some(prelude_module) = self.def_collector.def_map.prelude { |
536 | if prelude_module.krate != self.def_collector.def_map.krate { | 535 | if prelude_module.krate != self.def_collector.def_map.krate { |
537 | // tested_by!(prelude_is_macro_use); | 536 | tested_by!(prelude_is_macro_use); |
538 | self.def_collector.import_all_macros_exported(self.module_id, prelude_module.krate); | 537 | self.def_collector.import_all_macros_exported(self.module_id, prelude_module.krate); |
539 | } | 538 | } |
540 | } | 539 | } |