8 files changed, 47 insertions, 109 deletions
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/ra_hir_def/src/adt.rs
index ec3d57d1a..d9ea693e3 100644
--- a/crates/ra_hir_def/src/adt.rs
+++ b/crates/ra_hir_def/src/adt.rs
@@ -8,6 +8,7 @@ use hir_expand::{
    InFile,
 };
 use ra_arena::{map::ArenaMap, Arena};
+use ra_prof::profile;
 use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner};
 use crate::{
@@ -72,6 +73,7 @@ impl StructData {
 impl EnumData {
    pub(crate) fn enum_data_query(db: &impl DefDatabase, e: EnumId) -> Arc<EnumData> {
+        let _p = profile("enum_data_query");
        let src = e.lookup(db).source(db);
        let name = src.value.name().map_or_else(Name::missing, |n| n.as_name());
        let mut trace = Trace::new_for_arena();
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index 445d215b7..148ff007e 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -11,6 +11,7 @@ use hir_expand::{
    ast_id_map::AstIdMap, hygiene::Hygiene, AstId, HirFileId, InFile, MacroCallKind, MacroDefId,
 };
 use ra_arena::{map::ArenaMap, Arena};
+use ra_prof::profile;
 use ra_syntax::{ast, AstNode, AstPtr};
 use rustc_hash::FxHashMap;
@@ -168,6 +169,7 @@ impl Body {
        db: &impl DefDatabase,
        def: DefWithBodyId,
    ) -> (Arc<Body>, Arc<BodySourceMap>) {
+        let _p = profile("body_with_source_map_query");
        let mut params = None;
        let (file_id, module, body) = match def {
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_def/src/db.rs
index 98bff6cb7..c55fd4111 100644
--- a/crates/ra_hir_def/src/db.rs
+++ b/crates/ra_hir_def/src/db.rs
@@ -13,10 +13,7 @@ use crate::{
    docs::Documentation,
    generics::GenericParams,
    lang_item::{LangItemTarget, LangItems},
-    nameres::{
+    nameres::{raw::RawItems, CrateDefMap},
-        raw::{ImportSourceMap, RawItems},
-        CrateDefMap,
-    },
    AttrDefId, ConstId, ConstLoc, DefWithBodyId, EnumId, EnumLoc, FunctionId, FunctionLoc,
    GenericDefId, ImplId, ImplLoc, ModuleId, StaticId, StaticLoc, StructId, StructLoc, TraitId,
    TraitLoc, TypeAliasId, TypeAliasLoc, UnionId, UnionLoc,
@@ -46,12 +43,6 @@ pub trait InternDatabase: SourceDatabase {
 #[salsa::query_group(DefDatabaseStorage)]
 pub trait DefDatabase: InternDatabase + AstDatabase {
-    #[salsa::invoke(RawItems::raw_items_with_source_map_query)]
-    fn raw_items_with_source_map(
-        &self,
-        file_id: HirFileId,
-    ) -> (Arc<RawItems>, Arc<ImportSourceMap>);
    #[salsa::invoke(RawItems::raw_items_query)]
    fn raw_items(&self, file_id: HirFileId) -> Arc<RawItems>;
diff --git a/crates/ra_hir_def/src/item_scope.rs b/crates/ra_hir_def/src/item_scope.rs
index 6b9be8325..9e082c5f7 100644
--- a/crates/ra_hir_def/src/item_scope.rs
+++ b/crates/ra_hir_def/src/item_scope.rs
@@ -5,7 +5,7 @@ use hir_expand::name::Name;
 use once_cell::sync::Lazy;
 use rustc_hash::FxHashMap;
-use crate::{per_ns::PerNs, BuiltinType, ImplId, LocalImportId, MacroDefId, ModuleDefId, TraitId};
+use crate::{per_ns::PerNs, BuiltinType, ImplId, MacroDefId, ModuleDefId, TraitId};
 #[derive(Debug, Default, PartialEq, Eq)]
 pub struct ItemScope {
@@ -30,7 +30,7 @@ static BUILTIN_SCOPE: Lazy<FxHashMap<Name, Resolution>> = Lazy::new(|| {
    BuiltinType::ALL
        .iter()
        .map(|(name, ty)| {
-            (name.clone(), Resolution { def: PerNs::types(ty.clone().into()), import: None })
+            (name.clone(), Resolution { def: PerNs::types(ty.clone().into()), import: false })
        })
        .collect()
 });
@@ -54,7 +54,7 @@ impl ItemScope {
    pub fn declarations(&self) -> impl Iterator<Item = ModuleDefId> + '_ {
        self.entries()
-            .filter_map(|(_name, res)| if res.import.is_none() { Some(res.def) } else { None })
+            .filter_map(|(_name, res)| if !res.import { Some(res.def) } else { None })
            .flat_map(|per_ns| {
                per_ns.take_types().into_iter().chain(per_ns.take_values().into_iter())
            })
@@ -112,36 +112,27 @@ impl ItemScope {
        self.legacy_macros.insert(name, mac);
    }
-    pub(crate) fn push_res(
+    pub(crate) fn push_res(&mut self, name: Name, res: &Resolution, import: bool) -> bool {
-        &mut self,
-        name: Name,
-        res: &Resolution,
-        import: Option<LocalImportId>,
-    ) -> bool {
        let mut changed = false;
        let existing = self.items.entry(name.clone()).or_default();
        if existing.def.types.is_none() && res.def.types.is_some() {
            existing.def.types = res.def.types;
-            existing.import = import.or(res.import);
+            existing.import = import || res.import;
            changed = true;
        }
        if existing.def.values.is_none() && res.def.values.is_some() {
            existing.def.values = res.def.values;
-            existing.import = import.or(res.import);
+            existing.import = import || res.import;
            changed = true;
        }
        if existing.def.macros.is_none() && res.def.macros.is_some() {
            existing.def.macros = res.def.macros;
-            existing.import = import.or(res.import);
+            existing.import = import || res.import;
            changed = true;
        }
-        if existing.def.is_none()
+        if existing.def.is_none() && res.def.is_none() && !existing.import && res.import {
-            && res.def.is_none()
-            && existing.import.is_none()
-            && res.import.is_some()
-        {
            existing.import = res.import;
        }
        changed
@@ -160,6 +151,5 @@ impl ItemScope {
 pub struct Resolution {
    /// None for unresolved
    pub def: PerNs,
-    /// ident by which this is imported into local scope.
+    pub(crate) import: bool,
-    pub import: Option<LocalImportId>,
 }
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs
index acd4f4af1..f6c7f38d1 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_def/src/lib.rs
@@ -52,10 +52,6 @@ use crate::body::Expander;
 use crate::builtin_type::BuiltinType;
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct LocalImportId(RawId);
-impl_arena_id!(LocalImportId);
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct ModuleId {
    pub krate: CrateId,
    pub local_id: LocalModuleId,
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index 45199fa11..2b194f488 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -26,8 +26,7 @@ use crate::{
    path::{ModPath, PathKind},
    per_ns::PerNs,
    AdtId, AstId, ConstLoc, ContainerId, EnumLoc, EnumVariantId, FunctionLoc, ImplLoc, Intern,
-    LocalImportId, LocalModuleId, ModuleDefId, ModuleId, StaticLoc, StructLoc, TraitLoc,
+    LocalModuleId, ModuleDefId, ModuleId, StaticLoc, StructLoc, TraitLoc, TypeAliasLoc, UnionLoc,
-    TypeAliasLoc, UnionLoc,
 };
 pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> CrateDefMap {
@@ -93,7 +92,7 @@ impl PartialResolvedImport {
 #[derive(Clone, Debug, Eq, PartialEq)]
 struct ImportDirective {
    module_id: LocalModuleId,
-    import_id: LocalImportId,
+    import_id: raw::Import,
    import: raw::ImportData,
    status: PartialResolvedImport,
 }
@@ -110,7 +109,7 @@ struct MacroDirective {
 struct DefCollector<'a, DB> {
    db: &'a DB,
    def_map: CrateDefMap,
-    glob_imports: FxHashMap<LocalModuleId, Vec<(LocalModuleId, LocalImportId)>>,
+    glob_imports: FxHashMap<LocalModuleId, Vec<(LocalModuleId, raw::Import)>>,
    unresolved_imports: Vec<ImportDirective>,
    resolved_imports: Vec<ImportDirective>,
    unexpanded_macros: Vec<MacroDirective>,
@@ -219,7 +218,7 @@ where
            self.update(
                self.def_map.root,
                None,
-                &[(name, Resolution { def: PerNs::macros(macro_), import: None })],
+                &[(name, Resolution { def: PerNs::macros(macro_), import: false })],
            );
        }
    }
@@ -404,7 +403,7 @@ where
                            let variant = EnumVariantId { parent: e, local_id };
                            let res = Resolution {
                                def: PerNs::both(variant.into(), variant.into()),
-                                import: Some(import_id),
+                                import: true,
                            };
                            (name, res)
                        })
@@ -431,7 +430,7 @@ where
                        }
                    }
-                    let resolution = Resolution { def, import: Some(import_id) };
+                    let resolution = Resolution { def, import: true };
                    self.update(module_id, Some(import_id), &[(name, resolution)]);
                }
                None => tested_by!(bogus_paths),
@@ -442,7 +441,7 @@ where
    fn update(
        &mut self,
        module_id: LocalModuleId,
-        import: Option<LocalImportId>,
+        import: Option<raw::Import>,
        resolutions: &[(Name, Resolution)],
    ) {
        self.update_recursive(module_id, import, resolutions, 0)
@@ -451,7 +450,7 @@ where
    fn update_recursive(
        &mut self,
        module_id: LocalModuleId,
-        import: Option<LocalImportId>,
+        import: Option<raw::Import>,
        resolutions: &[(Name, Resolution)],
        depth: usize,
    ) {
@@ -462,7 +461,7 @@ where
        let scope = &mut self.def_map.modules[module_id].scope;
        let mut changed = false;
        for (name, res) in resolutions {
-            changed |= scope.push_res(name.clone(), res, import);
+            changed |= scope.push_res(name.clone(), res, import.is_some());
        }
        if !changed {
@@ -719,7 +718,7 @@ where
            def: PerNs::types(
                ModuleId { krate: self.def_collector.def_map.krate, local_id: res }.into(),
            ),
-            import: None,
+            import: false,
        };
        self.def_collector.update(self.module_id, None, &[(name, resolution)]);
        res
@@ -791,7 +790,7 @@ where
                PerNs::types(def.into())
            }
        };
-        let resolution = Resolution { def, import: None };
+        let resolution = Resolution { def, import: false };
        self.def_collector.update(self.module_id, None, &[(name, resolution)])
    }
diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs
index ecb4d7c03..73dc08745 100644
--- a/crates/ra_hir_def/src/nameres/raw.rs
+++ b/crates/ra_hir_def/src/nameres/raw.rs
@@ -7,24 +7,21 @@
 use std::{ops::Index, sync::Arc};
-use either::Either;
 use hir_expand::{
    ast_id_map::AstIdMap,
    db::AstDatabase,
    hygiene::Hygiene,
    name::{AsName, Name},
 };
-use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
+use ra_arena::{impl_arena_id, Arena, RawId};
+use ra_prof::profile;
 use ra_syntax::{
    ast::{self, AttrsOwner, NameOwner},
-    AstNode, AstPtr,
+    AstNode,
 };
 use test_utils::tested_by;
-use crate::{
+use crate::{attr::Attrs, db::DefDatabase, path::ModPath, FileAstId, HirFileId, InFile};
-    attr::Attrs, db::DefDatabase, path::ModPath, trace::Trace, FileAstId, HirFileId, InFile,
-    LocalImportId,
-};
 /// `RawItems` is a set of top-level items in a file (except for impls).
 ///
@@ -33,7 +30,7 @@ use crate::{
 #[derive(Debug, Default, PartialEq, Eq)]
 pub struct RawItems {
    modules: Arena<Module, ModuleData>,
-    imports: Arena<LocalImportId, ImportData>,
+    imports: Arena<Import, ImportData>,
    defs: Arena<Def, DefData>,
    macros: Arena<Macro, MacroData>,
    impls: Arena<Impl, ImplData>,
@@ -41,35 +38,15 @@ pub struct RawItems {
    items: Vec<RawItem>,
 }
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct ImportSourceMap {
-    map: ArenaMap<LocalImportId, ImportSourcePtr>,
-}
-type ImportSourcePtr = Either<AstPtr<ast::UseTree>, AstPtr<ast::ExternCrateItem>>;
-impl ImportSourceMap {
-    pub fn get(&self, import: LocalImportId) -> ImportSourcePtr {
-        self.map[import].clone()
-    }
-}
 impl RawItems {
    pub(crate) fn raw_items_query(
        db: &(impl DefDatabase + AstDatabase),
        file_id: HirFileId,
    ) -> Arc<RawItems> {
-        db.raw_items_with_source_map(file_id).0
+        let _p = profile("raw_items_query");
-    }
-    pub(crate) fn raw_items_with_source_map_query(
-        db: &(impl DefDatabase + AstDatabase),
-        file_id: HirFileId,
-    ) -> (Arc<RawItems>, Arc<ImportSourceMap>) {
        let mut collector = RawItemsCollector {
            raw_items: RawItems::default(),
            source_ast_id_map: db.ast_id_map(file_id),
-            imports: Trace::new(),
            file_id,
            hygiene: Hygiene::new(db, file_id),
        };
@@ -80,11 +57,8 @@ impl RawItems {
                collector.process_module(None, item_list);
            }
        }
-        let mut raw_items = collector.raw_items;
+        let raw_items = collector.raw_items;
-        let (arena, map) = collector.imports.into_arena_and_map();
+        Arc::new(raw_items)
-        raw_items.imports = arena;
-        let source_map = ImportSourceMap { map };
-        (Arc::new(raw_items), Arc::new(source_map))
    }
    pub(super) fn items(&self) -> &[RawItem] {
@@ -99,9 +73,9 @@ impl Index<Module> for RawItems {
    }
 }
-impl Index<LocalImportId> for RawItems {
+impl Index<Import> for RawItems {
    type Output = ImportData;
-    fn index(&self, idx: LocalImportId) -> &ImportData {
+    fn index(&self, idx: Import) -> &ImportData {
        &self.imports[idx]
    }
 }
@@ -136,7 +110,7 @@ pub(super) struct RawItem {
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub(super) enum RawItemKind {
    Module(Module),
-    Import(LocalImportId),
+    Import(Import),
    Def(Def),
    Macro(Macro),
    Impl(Impl),
@@ -152,6 +126,10 @@ pub(super) enum ModuleData {
    Definition { name: Name, ast_id: FileAstId<ast::Module>, items: Vec<RawItem> },
 }
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub(crate) struct Import(RawId);
+impl_arena_id!(Import);
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ImportData {
    pub(super) path: ModPath,
@@ -223,7 +201,6 @@ pub(super) struct ImplData {
 struct RawItemsCollector {
    raw_items: RawItems,
-    imports: Trace<LocalImportId, ImportData, ImportSourcePtr>,
    source_ast_id_map: Arc<AstIdMap>,
    file_id: HirFileId,
    hygiene: Hygiene,
@@ -330,7 +307,7 @@ impl RawItemsCollector {
        ModPath::expand_use_item(
            InFile { value: use_item, file_id: self.file_id },
            &self.hygiene,
-            |path, use_tree, is_glob, alias| {
+            |path, _use_tree, is_glob, alias| {
                let import_data = ImportData {
                    path,
                    alias,
@@ -339,11 +316,11 @@ impl RawItemsCollector {
                    is_extern_crate: false,
                    is_macro_use: false,
                };
-                buf.push((import_data, Either::Left(AstPtr::new(use_tree))));
+                buf.push(import_data);
            },
        );
-        for (import_data, ptr) in buf {
+        for import_data in buf {
-            self.push_import(current_module, attrs.clone(), import_data, ptr);
+            self.push_import(current_module, attrs.clone(), import_data);
        }
    }
@@ -366,12 +343,7 @@ impl RawItemsCollector {
                is_extern_crate: true,
                is_macro_use,
            };
-            self.push_import(
+            self.push_import(current_module, attrs, import_data);
-                current_module,
-                attrs,
-                import_data,
-                Either::Right(AstPtr::new(&extern_crate)),
-            );
        }
    }
@@ -402,14 +374,8 @@ impl RawItemsCollector {
        self.push_item(current_module, attrs, RawItemKind::Impl(imp))
    }
-    fn push_import(
+    fn push_import(&mut self, current_module: Option<Module>, attrs: Attrs, data: ImportData) {
-        &mut self,
+        let import = self.raw_items.imports.alloc(data);
-        current_module: Option<Module>,
-        attrs: Attrs,
-        data: ImportData,
-        source: ImportSourcePtr,
-    ) {
-        let import = self.imports.alloc(|| source, || data);
        self.push_item(current_module, attrs, RawItemKind::Import(import))
    }
diff --git a/crates/ra_hir_def/src/trace.rs b/crates/ra_hir_def/src/trace.rs
index 2bcd707bc..9769e88df 100644
--- a/crates/ra_hir_def/src/trace.rs
+++ b/crates/ra_hir_def/src/trace.rs
@@ -18,10 +18,6 @@ pub(crate) struct Trace<ID: ArenaId, T, V> {
 }
 impl<ID: ra_arena::ArenaId + Copy, T, V> Trace<ID, T, V> {
-    pub(crate) fn new() -> Trace<ID, T, V> {
-        Trace { arena: Some(Arena::default()), map: Some(ArenaMap::default()), len: 0 }
-    }
    pub(crate) fn new_for_arena() -> Trace<ID, T, V> {
        Trace { arena: Some(Arena::default()), map: None, len: 0 }
    }
@@ -52,8 +48,4 @@ impl<ID: ra_arena::ArenaId + Copy, T, V> Trace<ID, T, V> {
    pub(crate) fn into_map(mut self) -> ArenaMap<ID, V> {
        self.map.take().unwrap()
    }
-    pub(crate) fn into_arena_and_map(mut self) -> (Arena<ID, T>, ArenaMap<ID, V>) {
-        (self.arena.take().unwrap(), self.map.take().unwrap())
-    }
 }