rust-analyzer

diff --git a/crates/hir-def/src/nameres.rs b/crates/hir-def/src/nameres.rs
index e900de88dd..e4693a2b78 100644
--- a/crates/hir-def/src/nameres.rs
+++ b/crates/hir-def/src/nameres.rs

@@ -103,8 +103,6 @@ pub struct DefMap {

/// but that attribute is nightly and when used in a block, it affects resolution globally

/// so we aren't handling this correctly anyways).

prelude: Option<ModuleId>,

- /// The extern prelude is only populated for non-block DefMaps

- extern_prelude: FxHashMap<Name, ModuleId>,

/// `macro_use` prelude that contains macros from `#[macro_use]`'d external crates. Note that

/// this contains all kinds of macro, not just `macro_rules!` macro.

macro_use_prelude: FxHashMap<Name, MacroId>,

@@ -115,12 +113,13 @@ pub struct DefMap {

diagnostics: Vec<DefDiagnostic>,

- // FIXME: Arc this so we can share it with block def maps

data: Arc<CrateData>,

}

#[derive(Clone, Debug, PartialEq, Eq)]

struct CrateData {

+ extern_prelude: FxHashMap<Name, ModuleId>,

/// Side table for resolving derive helpers.

exported_derives: FxHashMap<MacroDefId, Box<[Name]>>,

fn_proc_macro_mapping: FxHashMap<FunctionId, ProcMacroId>,

@@ -141,9 +140,11 @@ struct CrateData {

edition: Edition,

recursion_limit: Option<u32>,

}

impl CrateData {

fn shrink_to_fit(&mut self) {

let Self {

+ extern_prelude,

exported_derives,

fn_proc_macro_mapping,

registered_attrs,

@@ -156,6 +157,7 @@ impl CrateData {

edition: _,

recursion_limit: _,

} = self;

+ extern_prelude.shrink_to_fit();

exported_derives.shrink_to_fit();

fn_proc_macro_mapping.shrink_to_fit();

registered_attrs.shrink_to_fit();

@@ -181,7 +183,11 @@ struct BlockRelativeModuleId {

impl BlockRelativeModuleId {

fn def_map(self, db: &dyn DefDatabase, krate: CrateId) -> Arc<DefMap> {

- ModuleId { krate, block: self.block, local_id: self.local_id }.def_map(db)

+ self.into_module(krate).def_map(db)

+ }

+ fn into_module(self, krate: CrateId) -> ModuleId {

+ ModuleId { krate, block: self.block, local_id: self.local_id }

}

@@ -330,15 +336,14 @@ impl DefMap {

DefMap {

_c: Count::new(),

block: None,

+ modules,

krate,

- extern_prelude: FxHashMap::default(),

+ prelude: None,

macro_use_prelude: FxHashMap::default(),

derive_helpers_in_scope: FxHashMap::default(),

- prelude: None,

- modules,

diagnostics: Vec::new(),

data: Arc::new(CrateData {

- recursion_limit: None,

+ extern_prelude: FxHashMap::default(),

exported_derives: FxHashMap::default(),

fn_proc_macro_mapping: FxHashMap::default(),

proc_macro_loading_error: None,

@@ -349,6 +354,7 @@ impl DefMap {

no_core: false,

no_std: false,

edition,

+ recursion_limit: None,

}),

}

@@ -412,7 +418,7 @@ impl DefMap {

}

pub(crate) fn extern_prelude(&self) -> impl Iterator<Item = (&Name, ModuleId)> + '_ {

- self.extern_prelude.iter().map(|(name, def)| (name, *def))

+ self.data.extern_prelude.iter().map(|(name, def)| (name, *def))

}

pub(crate) fn macro_use_prelude(&self) -> impl Iterator<Item = (&Name, MacroId)> + '_ {

@@ -573,7 +579,6 @@ impl DefMap {

// Exhaustive match to require handling new fields.

let Self {

_c: _,

- extern_prelude,

macro_use_prelude,

diagnostics,

modules,

@@ -584,7 +589,6 @@ impl DefMap {

data: _,

} = self;

- extern_prelude.shrink_to_fit();

macro_use_prelude.shrink_to_fit();

diagnostics.shrink_to_fit();

modules.shrink_to_fit();

diff --git a/crates/hir-def/src/nameres/collector.rs b/crates/hir-def/src/nameres/collector.rs
index 9e35c47d4f..29ee13648e 100644
--- a/crates/hir-def/src/nameres/collector.rs
+++ b/crates/hir-def/src/nameres/collector.rs

@@ -5,7 +5,7 @@

use std::{iter, mem};

-use base_db::{CrateId, Edition, FileId};

+use base_db::{CrateId, Dependency, Edition, FileId};

use cfg::{CfgExpr, CfgOptions};

use either::Either;

use hir_expand::{

@@ -62,7 +62,7 @@ static GLOB_RECURSION_LIMIT: Limit = Limit::new(100);

static EXPANSION_DEPTH_LIMIT: Limit = Limit::new(128);

static FIXED_POINT_LIMIT: Limit = Limit::new(8192);

-pub(super) fn collect_defs(db: &dyn DefDatabase, mut def_map: DefMap, tree_id: TreeId) -> DefMap {

+pub(super) fn collect_defs(db: &dyn DefDatabase, def_map: DefMap, tree_id: TreeId) -> DefMap {

let crate_graph = db.crate_graph();

let mut deps = FxHashMap::default();

@@ -70,14 +70,8 @@ pub(super) fn collect_defs(db: &dyn DefDatabase, mut def_map: DefMap, tree_id: T

let krate = &crate_graph[def_map.krate];

for dep in &krate.dependencies {

tracing::debug!("crate dep {:?} -> {:?}", dep.name, dep.crate_id);

- let dep_def_map = db.crate_def_map(dep.crate_id);

- let dep_root = dep_def_map.module_id(DefMap::ROOT);

- deps.insert(dep.as_name(), dep_root);

- if dep.is_prelude() && !tree_id.is_block() {

- def_map.extern_prelude.insert(dep.as_name(), dep_root);

- }

+ deps.insert(dep.as_name(), dep.clone());

}

let cfg_options = &krate.cfg_options;

@@ -245,7 +239,7 @@ enum MacroDirectiveKind {

struct DefCollector<'a> {

db: &'a dyn DefDatabase,

def_map: DefMap,

- deps: FxHashMap<Name, ModuleId>,

+ deps: FxHashMap<Name, Dependency>,

glob_imports: FxHashMap<LocalModuleId, Vec<(LocalModuleId, Visibility)>>,

unresolved_imports: Vec<ImportDirective>,

indeterminate_imports: Vec<ImportDirective>,

@@ -289,6 +283,15 @@ impl DefCollector<'_> {

crate_data.proc_macro_loading_error = Some(e.clone());

}

+ for (name, dep) in &self.deps {

+ if dep.is_prelude() {

+ crate_data.extern_prelude.insert(

+ name.clone(),

+ ModuleId { krate: dep.crate_id, block: None, local_id: DefMap::ROOT },

+ );

+ }

// Process other crate-level attributes.

for attr in &*attrs {

if let Some(cfg) = attr.cfg() {

@@ -832,15 +835,16 @@ impl DefCollector<'_> {

if *name == name!(self) {

cov_mark::hit!(extern_crate_self_as);

let root = match self.def_map.block {

- Some(_) => {

- let def_map = self.def_map.crate_root(self.db).def_map(self.db);

- def_map.module_id(DefMap::ROOT)

- }

+ Some(_) => self.def_map.crate_root(self.db),

None => self.def_map.module_id(DefMap::ROOT),

};

Some(root)

} else {

- self.deps.get(name).copied()

+ self.deps.get(name).map(|dep| ModuleId {

+ krate: dep.crate_id,

+ block: None,

+ local_id: DefMap::ROOT,

+ })

}

@@ -883,7 +887,10 @@ impl DefCollector<'_> {

{

if let (Some(ModuleDefId::ModuleId(def)), Some(name)) = (def.take_types(), name)

{

- self.def_map.extern_prelude.insert(name.clone(), def);

+ Arc::get_mut(&mut self.def_map.data)

+ .unwrap()

+ .extern_prelude

+ .insert(name.clone(), def);

}

diff --git a/crates/hir-def/src/nameres/path_resolution.rs b/crates/hir-def/src/nameres/path_resolution.rs
index bfba6eab6d..c5335aaf12 100644
--- a/crates/hir-def/src/nameres/path_resolution.rs
+++ b/crates/hir-def/src/nameres/path_resolution.rs

@@ -80,8 +80,8 @@ impl DefMap {

name: &Name,

) -> Option<ModuleId> {

match self.block {

- Some(_) => self.crate_root(db).def_map(db).extern_prelude.get(name).copied(),

- None => self.extern_prelude.get(name).copied(),

+ Some(_) => self.crate_root(db).def_map(db).data.extern_prelude.get(name).copied(),

+ None => self.data.extern_prelude.get(name).copied(),

}

@@ -304,7 +304,7 @@ impl DefMap {

Some((_, segment)) => segment,

None => return ResolvePathResult::empty(ReachedFixedPoint::Yes),

};

- if let Some(&def) = self.extern_prelude.get(segment) {

+ if let Some(&def) = self.data.extern_prelude.get(segment) {

tracing::debug!("absolute path {:?} resolved to crate {:?}", path, def);

PerNs::types(def.into(), Visibility::Public)

} else {

@@ -453,7 +453,8 @@ impl DefMap {

};

let extern_prelude = || {

- self.extern_prelude

+ self.data

+ .extern_prelude

.get(name)

.map_or(PerNs::none(), |&it| PerNs::types(it.into(), Visibility::Public))

};