Merge branch 'master' into feature/themes

author: Seivan Heidari <seivan.heidari@icloud.com> 2019-10-31 08:43:20 +0000
committer: Seivan Heidari <seivan.heidari@icloud.com> 2019-10-31 08:43:20 +0000
commit: 8edda0e7b164009d6c03bb3d4be603fb38ad2e2a (patch)
tree: 744cf81075d394e2f9c06afb07642a2601800dda /crates/ra_hir/src/code_model.rs
parent: 49562d36b97ddde34cf7585a8c2e8f232519b657 (diff)
parent: d067afb064a7fa67b172abf561b7d80740cd6f18 (diff)
1 files changed, 61 insertions, 121 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 8eb3c577d..b32aa145e 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -5,11 +5,17 @@ pub(crate) mod docs;
 use std::sync::Arc;
-use ra_db::{CrateId, Edition, FileId};
+use hir_def::{
+    builtin_type::BuiltinType,
+    type_ref::{Mutability, TypeRef},
+    CrateModuleId, LocalEnumVariantId, ModuleId,
+};
+use hir_expand::name::{self, AsName};
+use ra_db::{CrateId, Edition};
 use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner};
 use crate::{
-    adt::{EnumVariantId, StructFieldId, VariantDef},
+    adt::{StructFieldId, VariantDef},
    db::{AstDatabase, DefDatabase, HirDatabase},
    diagnostics::DiagnosticSink,
    expr::{validation::ExprValidator, Body, BodySourceMap},
@@ -19,20 +25,11 @@ use crate::{
        TypeAliasId,
    },
    impl_block::ImplBlock,
-    name::{
+    nameres::{ImportId, ModuleScope, Namespace},
-        BOOL, CHAR, F32, F64, I128, I16, I32, I64, I8, ISIZE, SELF_TYPE, STR, U128, U16, U32, U64,
-        U8, USIZE,
-    },
-    nameres::{CrateModuleId, ImportId, ModuleScope, Namespace},
    resolve::{Resolver, Scope, TypeNs},
    traits::TraitData,
-    ty::{
+    ty::{InferenceResult, TraitRef},
-        primitive::{FloatBitness, FloatTy, IntBitness, IntTy, Signedness},
+    Either, HasSource, Name, Ty,
-        InferenceResult, TraitRef,
-    },
-    type_ref::Mutability,
-    type_ref::TypeRef,
-    AsName, AstId, Either, HasSource, Name, Ty,
 };
 /// hir::Crate describes a single crate. It's the main interface with which
@@ -67,8 +64,7 @@ impl Crate {
    pub fn root_module(self, db: &impl DefDatabase) -> Option<Module> {
        let module_id = db.crate_def_map(self).root();
-        let module = Module { krate: self, module_id };
+        Some(Module::new(self, module_id))
-        Some(module)
    }
    pub fn edition(self, db: &impl DefDatabase) -> Edition {
@@ -83,43 +79,7 @@ impl Crate {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct Module {
-    pub(crate) krate: Crate,
+    pub(crate) id: ModuleId,
-    pub(crate) module_id: CrateModuleId,
-}
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum BuiltinType {
-    Char,
-    Bool,
-    Str,
-    Int(IntTy),
-    Float(FloatTy),
-}
-impl BuiltinType {
-    #[rustfmt::skip]
-    pub(crate) const ALL: &'static [(Name, BuiltinType)] = &[
-        (CHAR, BuiltinType::Char),
-        (BOOL, BuiltinType::Bool),
-        (STR, BuiltinType::Str),
-        (ISIZE, BuiltinType::Int(IntTy { signedness: Signedness::Signed, bitness: IntBitness::Xsize })),
-        (I8,    BuiltinType::Int(IntTy { signedness: Signedness::Signed, bitness: IntBitness::X8 })),
-        (I16,   BuiltinType::Int(IntTy { signedness: Signedness::Signed, bitness: IntBitness::X16 })),
-        (I32,   BuiltinType::Int(IntTy { signedness: Signedness::Signed, bitness: IntBitness::X32 })),
-        (I64,   BuiltinType::Int(IntTy { signedness: Signedness::Signed, bitness: IntBitness::X64 })),
-        (I128,  BuiltinType::Int(IntTy { signedness: Signedness::Signed, bitness: IntBitness::X128 })),
-        (USIZE, BuiltinType::Int(IntTy { signedness: Signedness::Unsigned, bitness: IntBitness::Xsize })),
-        (U8,    BuiltinType::Int(IntTy { signedness: Signedness::Unsigned, bitness: IntBitness::X8 })),
-        (U16,   BuiltinType::Int(IntTy { signedness: Signedness::Unsigned, bitness: IntBitness::X16 })),
-        (U32,   BuiltinType::Int(IntTy { signedness: Signedness::Unsigned, bitness: IntBitness::X32 })),
-        (U64,   BuiltinType::Int(IntTy { signedness: Signedness::Unsigned, bitness: IntBitness::X64 })),
-        (U128,  BuiltinType::Int(IntTy { signedness: Signedness::Unsigned, bitness: IntBitness::X128 })),
-        (F32, BuiltinType::Float(FloatTy { bitness: FloatBitness::X32 })),
-        (F64, BuiltinType::Float(FloatTy { bitness: FloatBitness::X64 })),
-    ];
 }
 /// The defs which can be visible in the module.
@@ -148,39 +108,19 @@ impl_froms!(
    BuiltinType
 );
-pub enum ModuleSource {
+pub use hir_def::ModuleSource;
-    SourceFile(ast::SourceFile),
-    Module(ast::Module),
-}
-impl ModuleSource {
+impl Module {
-    pub(crate) fn new(
+    pub(crate) fn new(krate: Crate, crate_module_id: CrateModuleId) -> Module {
-        db: &(impl DefDatabase + AstDatabase),
+        Module { id: ModuleId { krate: krate.crate_id, module_id: crate_module_id } }
-        file_id: Option<FileId>,
-        decl_id: Option<AstId<ast::Module>>,
-    ) -> ModuleSource {
-        match (file_id, decl_id) {
-            (Some(file_id), _) => {
-                let source_file = db.parse(file_id).tree();
-                ModuleSource::SourceFile(source_file)
-            }
-            (None, Some(item_id)) => {
-                let module = item_id.to_node(db);
-                assert!(module.item_list().is_some(), "expected inline module");
-                ModuleSource::Module(module)
-            }
-            (None, None) => panic!(),
-        }
    }
-}
-impl Module {
    /// Name of this module.
    pub fn name(self, db: &impl DefDatabase) -> Option<Name> {
-        let def_map = db.crate_def_map(self.krate);
+        let def_map = db.crate_def_map(self.krate());
-        let parent = def_map[self.module_id].parent?;
+        let parent = def_map[self.id.module_id].parent?;
        def_map[parent].children.iter().find_map(|(name, module_id)| {
-            if *module_id == self.module_id {
+            if *module_id == self.id.module_id {
                Some(name.clone())
            } else {
                None
@@ -200,29 +140,29 @@ impl Module {
    }
    /// Returns the crate this module is part of.
-    pub fn krate(self, _db: &impl DefDatabase) -> Option<Crate> {
+    pub fn krate(self) -> Crate {
-        Some(self.krate)
+        Crate { crate_id: self.id.krate }
    }
    /// Topmost parent of this module. Every module has a `crate_root`, but some
    /// might be missing `krate`. This can happen if a module's file is not included
    /// in the module tree of any target in `Cargo.toml`.
    pub fn crate_root(self, db: &impl DefDatabase) -> Module {
-        let def_map = db.crate_def_map(self.krate);
+        let def_map = db.crate_def_map(self.krate());
        self.with_module_id(def_map.root())
    }
    /// Finds a child module with the specified name.
    pub fn child(self, db: &impl HirDatabase, name: &Name) -> Option<Module> {
-        let def_map = db.crate_def_map(self.krate);
+        let def_map = db.crate_def_map(self.krate());
-        let child_id = def_map[self.module_id].children.get(name)?;
+        let child_id = def_map[self.id.module_id].children.get(name)?;
        Some(self.with_module_id(*child_id))
    }
    /// Iterates over all child modules.
    pub fn children(self, db: &impl DefDatabase) -> impl Iterator<Item = Module> {
-        let def_map = db.crate_def_map(self.krate);
+        let def_map = db.crate_def_map(self.krate());
-        let children = def_map[self.module_id]
+        let children = def_map[self.id.module_id]
            .children
            .iter()
            .map(|(_, module_id)| self.with_module_id(*module_id))
@@ -232,8 +172,8 @@ impl Module {
    /// Finds a parent module.
    pub fn parent(self, db: &impl DefDatabase) -> Option<Module> {
-        let def_map = db.crate_def_map(self.krate);
+        let def_map = db.crate_def_map(self.krate());
-        let parent_id = def_map[self.module_id].parent?;
+        let parent_id = def_map[self.id.module_id].parent?;
        Some(self.with_module_id(parent_id))
    }
@@ -249,11 +189,11 @@ impl Module {
    /// Returns a `ModuleScope`: a set of items, visible in this module.
    pub fn scope(self, db: &impl HirDatabase) -> ModuleScope {
-        db.crate_def_map(self.krate)[self.module_id].scope.clone()
+        db.crate_def_map(self.krate())[self.id.module_id].scope.clone()
    }
    pub fn diagnostics(self, db: &impl HirDatabase, sink: &mut DiagnosticSink) {
-        db.crate_def_map(self.krate).add_diagnostics(db, self.module_id, sink);
+        db.crate_def_map(self.krate()).add_diagnostics(db, self.id.module_id, sink);
        for decl in self.declarations(db) {
            match decl {
                crate::ModuleDef::Function(f) => f.diagnostics(db, sink),
@@ -277,13 +217,13 @@ impl Module {
    }
    pub(crate) fn resolver(self, db: &impl DefDatabase) -> Resolver {
-        let def_map = db.crate_def_map(self.krate);
+        let def_map = db.crate_def_map(self.krate());
-        Resolver::default().push_module_scope(def_map, self.module_id)
+        Resolver::default().push_module_scope(def_map, self.id.module_id)
    }
    pub fn declarations(self, db: &impl DefDatabase) -> Vec<ModuleDef> {
-        let def_map = db.crate_def_map(self.krate);
+        let def_map = db.crate_def_map(self.krate());
-        def_map[self.module_id]
+        def_map[self.id.module_id]
            .scope
            .entries()
            .filter_map(|(_name, res)| if res.import.is_none() { Some(res.def) } else { None })
@@ -303,7 +243,7 @@ impl Module {
    }
    fn with_module_id(self, module_id: CrateModuleId) -> Module {
-        Module { module_id, krate: self.krate }
+        Module::new(self.krate(), module_id)
    }
 }
@@ -340,11 +280,11 @@ pub struct Struct {
 impl Struct {
    pub fn module(self, db: &impl DefDatabase) -> Module {
-        self.id.module(db)
+        Module { id: self.id.module(db) }
    }
    pub fn krate(self, db: &impl DefDatabase) -> Option<Crate> {
-        self.module(db).krate(db)
+        Some(self.module(db).krate())
    }
    pub fn name(self, db: &impl DefDatabase) -> Option<Name> {
@@ -402,7 +342,7 @@ impl Union {
    }
    pub fn module(self, db: &impl HirDatabase) -> Module {
-        self.id.module(db)
+        Module { id: self.id.module(db) }
    }
    pub fn ty(self, db: &impl HirDatabase) -> Ty {
@@ -428,11 +368,11 @@ pub struct Enum {
 impl Enum {
    pub fn module(self, db: &impl DefDatabase) -> Module {
-        self.id.module(db)
+        Module { id: self.id.module(db) }
    }
    pub fn krate(self, db: &impl DefDatabase) -> Option<Crate> {
-        self.module(db).krate(db)
+        Some(self.module(db).krate())
    }
    pub fn name(self, db: &impl DefDatabase) -> Option<Name> {
@@ -470,7 +410,7 @@ impl Enum {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct EnumVariant {
    pub(crate) parent: Enum,
-    pub(crate) id: EnumVariantId,
+    pub(crate) id: LocalEnumVariantId,
 }
 impl EnumVariant {
@@ -523,12 +463,14 @@ impl Adt {
    }
    pub fn krate(self, db: &impl HirDatabase) -> Option<Crate> {
-        match self {
+        Some(
-            Adt::Struct(s) => s.module(db),
+            match self {
-            Adt::Union(s) => s.module(db),
+                Adt::Struct(s) => s.module(db),
-            Adt::Enum(e) => e.module(db),
+                Adt::Union(s) => s.module(db),
-        }
+                Adt::Enum(e) => e.module(db),
-        .krate(db)
+            }
+            .krate(),
+        )
    }
    pub(crate) fn resolver(self, db: &impl HirDatabase) -> Resolver {
@@ -643,7 +585,7 @@ impl FnData {
                let self_type = if let Some(type_ref) = self_param.ascribed_type() {
                    TypeRef::from_ast(type_ref)
                } else {
-                    let self_type = TypeRef::Path(SELF_TYPE.into());
+                    let self_type = TypeRef::Path(name::SELF_TYPE.into());
                    match self_param.kind() {
                        ast::SelfParamKind::Owned => self_type,
                        ast::SelfParamKind::Ref => {
@@ -692,11 +634,11 @@ impl FnData {
 impl Function {
    pub fn module(self, db: &impl DefDatabase) -> Module {
-        self.id.module(db)
+        Module { id: self.id.module(db) }
    }
    pub fn krate(self, db: &impl DefDatabase) -> Option<Crate> {
-        self.module(db).krate(db)
+        Some(self.module(db).krate())
    }
    pub fn name(self, db: &impl HirDatabase) -> Name {
@@ -770,11 +712,11 @@ pub struct Const {
 impl Const {
    pub fn module(self, db: &impl DefDatabase) -> Module {
-        self.id.module(db)
+        Module { id: self.id.module(db) }
    }
    pub fn krate(self, db: &impl DefDatabase) -> Option<Crate> {
-        self.module(db).krate(db)
+        Some(self.module(db).krate())
    }
    pub fn data(self, db: &impl HirDatabase) -> Arc<ConstData> {
@@ -867,11 +809,11 @@ pub struct Static {
 impl Static {
    pub fn module(self, db: &impl DefDatabase) -> Module {
-        self.id.module(db)
+        Module { id: self.id.module(db) }
    }
    pub fn krate(self, db: &impl DefDatabase) -> Option<Crate> {
-        self.module(db).krate(db)
+        Some(self.module(db).krate())
    }
    pub fn data(self, db: &impl HirDatabase) -> Arc<ConstData> {
@@ -896,7 +838,7 @@ pub struct Trait {
 impl Trait {
    pub fn module(self, db: &impl DefDatabase) -> Module {
-        self.id.module(db)
+        Module { id: self.id.module(db) }
    }
    pub fn name(self, db: &impl DefDatabase) -> Option<Name> {
@@ -917,9 +859,7 @@ impl Trait {
            .where_predicates
            .iter()
            .filter_map(|pred| match &pred.type_ref {
-                TypeRef::Path(p) if p.as_ident() == Some(&crate::name::SELF_TYPE) => {
+                TypeRef::Path(p) if p.as_ident() == Some(&name::SELF_TYPE) => pred.bound.as_path(),
-                    pred.bound.as_path()
-                }
                _ => None,
            })
            .filter_map(|path| match resolver.resolve_path_in_type_ns_fully(db, path) {
@@ -998,11 +938,11 @@ pub struct TypeAlias {
 impl TypeAlias {
    pub fn module(self, db: &impl DefDatabase) -> Module {
-        self.id.module(db)
+        Module { id: self.id.module(db) }
    }
    pub fn krate(self, db: &impl DefDatabase) -> Option<Crate> {
-        self.module(db).krate(db)
+        Some(self.module(db).krate())
    }
    /// The containing impl block, if this is a method.
author	Seivan Heidari <seivan.heidari@icloud.com>	2019-10-31 08:43:20 +0000
committer	Seivan Heidari <seivan.heidari@icloud.com>	2019-10-31 08:43:20 +0000
commit	8edda0e7b164009d6c03bb3d4be603fb38ad2e2a (patch)
tree	744cf81075d394e2f9c06afb07642a2601800dda /crates/ra_hir/src/code_model.rs
parent	49562d36b97ddde34cf7585a8c2e8f232519b657 (diff)
parent	d067afb064a7fa67b172abf561b7d80740cd6f18 (diff)