From 08d3166c8b23b5a342f32e088f7e0d6e032ec17b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 8 Dec 2019 12:01:45 +0100 Subject: Cleanup Crate API --- crates/ra_hir/src/code_model.rs | 48 ++++++++++++++++++---------- crates/ra_hir/src/debug.rs | 4 +-- crates/ra_hir/src/from_id.rs | 4 +-- crates/ra_hir/src/from_source.rs | 2 +- crates/ra_ide/src/references/search_scope.rs | 16 ++++------ 5 files changed, 42 insertions(+), 32 deletions(-) (limited to 'crates') diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 4578a0ba8..3695115e4 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -25,7 +25,7 @@ use hir_expand::{ MacroDefId, }; use hir_ty::expr::ExprValidator; -use ra_db::{CrateId, Edition}; +use ra_db::{CrateId, Edition, FileId}; use ra_syntax::ast; use crate::{ @@ -40,7 +40,7 @@ use crate::{ /// root module. #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub struct Crate { - pub(crate) crate_id: CrateId, + pub(crate) id: CrateId, } #[derive(Debug)] @@ -50,33 +50,47 @@ pub struct CrateDependency { } impl Crate { - pub fn crate_id(self) -> CrateId { - self.crate_id - } - pub fn dependencies(self, db: &impl DefDatabase) -> Vec { db.crate_graph() - .dependencies(self.crate_id) + .dependencies(self.id) .map(|dep| { - let krate = Crate { crate_id: dep.crate_id() }; + let krate = Crate { id: dep.crate_id() }; let name = dep.as_name(); CrateDependency { krate, name } }) .collect() } + // FIXME: add `transitive_reverse_dependencies`. + pub fn reverse_dependencies(self, db: &impl DefDatabase) -> Vec { + let crate_graph = db.crate_graph(); + crate_graph + .iter() + .filter(|&krate| crate_graph.dependencies(krate).any(|it| it.crate_id == self.id)) + .map(|id| Crate { id }) + .collect() + } + pub fn root_module(self, db: &impl DefDatabase) -> Option { - let module_id = db.crate_def_map(self.crate_id).root; + let module_id = db.crate_def_map(self.id).root; Some(Module::new(self, module_id)) } + pub fn root_file(self, db: &impl DefDatabase) -> FileId { + db.crate_graph().crate_root(self.id) + } + pub fn edition(self, db: &impl DefDatabase) -> Edition { let crate_graph = db.crate_graph(); - crate_graph.edition(self.crate_id) + crate_graph.edition(self.id) } pub fn all(db: &impl DefDatabase) -> Vec { - db.crate_graph().iter().map(|crate_id| Crate { crate_id }).collect() + db.crate_graph().iter().map(|id| Crate { id }).collect() + } + + pub fn crate_id(self) -> CrateId { + self.id } } @@ -115,7 +129,7 @@ pub use hir_def::attr::Attrs; impl Module { pub(crate) fn new(krate: Crate, crate_module_id: LocalModuleId) -> Module { - Module { id: ModuleId { krate: krate.crate_id, local_id: crate_module_id } } + Module { id: ModuleId { krate: krate.id, local_id: crate_module_id } } } /// Name of this module. @@ -133,7 +147,7 @@ impl Module { /// Returns the crate this module is part of. pub fn krate(self) -> Crate { - Crate { crate_id: self.id.krate } + Crate { id: self.id.krate } } /// Topmost parent of this module. Every module has a `crate_root`, but some @@ -878,11 +892,11 @@ pub struct ImplBlock { impl ImplBlock { pub fn all_in_crate(db: &impl HirDatabase, krate: Crate) -> Vec { - let impls = db.impls_in_crate(krate.crate_id); + let impls = db.impls_in_crate(krate.id); impls.all_impls().map(Self::from).collect() } pub fn for_trait(db: &impl HirDatabase, krate: Crate, trait_: Trait) -> Vec { - let impls = db.impls_in_crate(krate.crate_id); + let impls = db.impls_in_crate(krate.id); impls.lookup_impl_blocks_for_trait(trait_.id).map(Self::from).collect() } @@ -915,7 +929,7 @@ impl ImplBlock { } pub fn krate(&self, db: &impl DefDatabase) -> Crate { - Crate { crate_id: self.module(db).id.krate } + Crate { id: self.module(db).id.krate } } } @@ -1053,7 +1067,7 @@ impl Type { krate: Crate, mut callback: impl FnMut(AssocItem) -> Option, ) -> Option { - for krate in self.ty.value.def_crates(db, krate.crate_id)? { + for krate in self.ty.value.def_crates(db, krate.id)? { let impls = db.impls_in_crate(krate); for impl_block in impls.lookup_impl_blocks(&self.ty.value) { diff --git a/crates/ra_hir/src/debug.rs b/crates/ra_hir/src/debug.rs index 7a2810f71..6cd5c8cb9 100644 --- a/crates/ra_hir/src/debug.rs +++ b/crates/ra_hir/src/debug.rs @@ -57,9 +57,9 @@ pub trait HirDebugDatabase { impl HirDebugDatabase for DB { fn debug_crate(&self, krate: Crate, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { let mut builder = fmt.debug_tuple("Crate"); - match self.crate_name(krate.crate_id) { + match self.crate_name(krate.id) { Some(name) => builder.field(&name), - None => builder.field(&krate.crate_id), + None => builder.field(&krate.id), } .finish() } diff --git a/crates/ra_hir/src/from_id.rs b/crates/ra_hir/src/from_id.rs index e96a18d12..0398d0ee6 100644 --- a/crates/ra_hir/src/from_id.rs +++ b/crates/ra_hir/src/from_id.rs @@ -14,8 +14,8 @@ use crate::{ }; impl From for Crate { - fn from(crate_id: ra_db::CrateId) -> Self { - Crate { crate_id } + fn from(id: ra_db::CrateId) -> Self { + Crate { id } } } diff --git a/crates/ra_hir/src/from_source.rs b/crates/ra_hir/src/from_source.rs index 4acc038e4..071ca2e5a 100644 --- a/crates/ra_hir/src/from_source.rs +++ b/crates/ra_hir/src/from_source.rs @@ -95,7 +95,7 @@ impl FromSource for MacroDef { let module_src = ModuleSource::from_child_node(db, src.as_ref().map(|it| it.syntax())); let module = Module::from_definition(db, InFile::new(src.file_id, module_src))?; - let krate = Some(module.krate().crate_id()); + let krate = Some(module.krate().id); let ast_id = Some(AstId::new(src.file_id, db.ast_id_map(src.file_id).ast_id(&src.value))); diff --git a/crates/ra_ide/src/references/search_scope.rs b/crates/ra_ide/src/references/search_scope.rs index f5c9589f4..241dd358f 100644 --- a/crates/ra_ide/src/references/search_scope.rs +++ b/crates/ra_ide/src/references/search_scope.rs @@ -5,7 +5,7 @@ use std::mem; use hir::{DefWithBody, HasSource, ModuleSource}; -use ra_db::{FileId, SourceDatabase, SourceDatabaseExt}; +use ra_db::{FileId, SourceDatabaseExt}; use ra_prof::profile; use ra_syntax::{AstNode, TextRange}; use rustc_hash::FxHashMap; @@ -120,15 +120,11 @@ impl NameDefinition { } if vis.as_str() == "pub" { let krate = self.container.krate(); - let crate_graph = db.crate_graph(); - for crate_id in crate_graph.iter() { - let mut crate_deps = crate_graph.dependencies(crate_id); - if crate_deps.any(|dep| dep.crate_id() == krate.crate_id()) { - let root_file = crate_graph.crate_root(crate_id); - let source_root_id = db.file_source_root(root_file); - let source_root = db.source_root(source_root_id); - res.extend(source_root.walk().map(|id| (id, None))); - } + for rev_dep in krate.reverse_dependencies(db) { + let root_file = rev_dep.root_file(db); + let source_root_id = db.file_source_root(root_file); + let source_root = db.source_root(source_root_id); + res.extend(source_root.walk().map(|id| (id, None))); } return SearchScope::new(res); } -- cgit v1.2.3 From 200bda3daf66f338e9bb1d833146f06fb81f829e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 8 Dec 2019 12:16:57 +0100 Subject: Cleanup Field ty --- crates/ra_hir/src/code_model.rs | 31 +++++++++++++++++++---------- crates/ra_hir_def/src/resolver.rs | 42 ++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 26 deletions(-) (limited to 'crates') diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 3695115e4..e854b22bf 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -265,8 +265,10 @@ impl StructField { self.parent.variant_data(db).fields()[self.id].name.clone() } - pub fn ty(&self, db: &impl HirDatabase) -> Ty { - db.field_types(self.parent.into())[self.id].clone() + pub fn ty(&self, db: &impl HirDatabase) -> Type { + let var_id = self.parent.into(); + let ty = db.field_types(var_id)[self.id].clone(); + Type::new(db, self.parent.module(db).id.krate.into(), var_id, ty) } pub fn parent_def(&self, _db: &impl HirDatabase) -> VariantDef { @@ -940,15 +942,19 @@ pub struct Type { } impl Type { + fn new(db: &impl HirDatabase, krate: CrateId, lexical_env: impl HasResolver, ty: Ty) -> Type { + let resolver = lexical_env.resolver(db); + let environment = TraitEnvironment::lower(db, &resolver); + Type { krate, ty: InEnvironment { value: ty, environment } } + } + fn from_def( db: &impl HirDatabase, krate: CrateId, def: impl HasResolver + Into, ) -> Type { - let resolver = def.resolver(db); - let environment = TraitEnvironment::lower(db, &resolver); let ty = db.ty(def.into()); - Type { krate, ty: InEnvironment { value: ty, environment } } + Type::new(db, krate, def, ty) } pub fn is_bool(&self) -> bool { @@ -1039,11 +1045,16 @@ impl Type { ) -> Vec<(StructField, Type)> { // FIXME: check that ty and def match match &self.ty.value { - Ty::Apply(a_ty) => def - .fields(db) - .into_iter() - .map(|it| (it, self.derived(it.ty(db).subst(&a_ty.parameters)))) - .collect(), + Ty::Apply(a_ty) => { + let field_types = db.field_types(def.into()); + def.fields(db) + .into_iter() + .map(|it| { + let ty = field_types[it.id].clone().subst(&a_ty.parameters); + (it, self.derived(ty)) + }) + .collect() + } _ => Vec::new(), } } diff --git a/crates/ra_hir_def/src/resolver.rs b/crates/ra_hir_def/src/resolver.rs index 4c859e497..9484a61d5 100644 --- a/crates/ra_hir_def/src/resolver.rs +++ b/crates/ra_hir_def/src/resolver.rs @@ -19,7 +19,7 @@ use crate::{ per_ns::PerNs, AdtId, AstItemDef, ConstId, ContainerId, DefWithBodyId, EnumId, EnumVariantId, FunctionId, GenericDefId, HasModule, ImplId, LocalModuleId, Lookup, ModuleDefId, ModuleId, StaticId, - StructId, TraitId, TypeAliasId, TypeParamId, + StructId, TraitId, TypeAliasId, TypeParamId, VariantId, }; #[derive(Debug, Clone, Default)] @@ -544,16 +544,6 @@ impl HasResolver for FunctionId { } } -impl HasResolver for DefWithBodyId { - fn resolver(self, db: &impl DefDatabase) -> Resolver { - match self { - DefWithBodyId::ConstId(c) => c.resolver(db), - DefWithBodyId::FunctionId(f) => f.resolver(db), - DefWithBodyId::StaticId(s) => s.resolver(db), - } - } -} - impl HasResolver for ConstId { fn resolver(self, db: &impl DefDatabase) -> Resolver { self.lookup(db).container.resolver(db) @@ -572,6 +562,25 @@ impl HasResolver for TypeAliasId { } } +impl HasResolver for ImplId { + fn resolver(self, db: &impl DefDatabase) -> Resolver { + self.module(db) + .resolver(db) + .push_generic_params_scope(db, self.into()) + .push_impl_block_scope(self) + } +} + +impl HasResolver for DefWithBodyId { + fn resolver(self, db: &impl DefDatabase) -> Resolver { + match self { + DefWithBodyId::ConstId(c) => c.resolver(db), + DefWithBodyId::FunctionId(f) => f.resolver(db), + DefWithBodyId::StaticId(s) => s.resolver(db), + } + } +} + impl HasResolver for ContainerId { fn resolver(self, db: &impl DefDatabase) -> Resolver { match self { @@ -596,11 +605,12 @@ impl HasResolver for GenericDefId { } } -impl HasResolver for ImplId { +impl HasResolver for VariantId { fn resolver(self, db: &impl DefDatabase) -> Resolver { - self.module(db) - .resolver(db) - .push_generic_params_scope(db, self.into()) - .push_impl_block_scope(self) + match self { + VariantId::EnumVariantId(it) => it.parent.resolver(db), + VariantId::StructId(it) => it.resolver(db), + VariantId::UnionId(it) => it.resolver(db), + } } } -- cgit v1.2.3 From 7aacf9a19739f53a45840df2d08b5f3cca761192 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 8 Dec 2019 12:20:59 +0100 Subject: Drop some unused methods --- crates/ra_hir/src/code_model.rs | 48 +--------------------------------------- crates/ra_hir/src/from_source.rs | 6 +++-- 2 files changed, 5 insertions(+), 49 deletions(-) (limited to 'crates') diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index e854b22bf..9cbea024a 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -158,13 +158,6 @@ impl Module { self.with_module_id(def_map.root) } - /// Finds a child module with the specified name. - pub fn child(self, db: &impl DefDatabase, name: &Name) -> Option { - let def_map = db.crate_def_map(self.id.krate); - let child_id = def_map[self.id.local_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 { let def_map = db.crate_def_map(self.id.krate); @@ -238,7 +231,7 @@ impl Module { def_map[self.id.local_id].impls.iter().copied().map(ImplBlock::from).collect() } - fn with_module_id(self, module_id: LocalModuleId) -> Module { + pub(crate) fn with_module_id(self, module_id: LocalModuleId) -> Module { Module::new(self.krate(), module_id) } } @@ -303,23 +296,10 @@ impl Struct { .collect() } - pub fn field(self, db: &impl HirDatabase, name: &Name) -> Option { - db.struct_data(self.id.into()) - .variant_data - .fields() - .iter() - .find(|(_id, data)| data.name == *name) - .map(|(id, _)| StructField { parent: self.into(), id }) - } - pub fn ty(self, db: &impl HirDatabase) -> Type { Type::from_def(db, self.id.module(db).krate, self.id) } - pub fn constructor_ty(self, db: &impl HirDatabase) -> Ty { - db.value_ty(self.id.into()) - } - fn variant_data(self, db: &impl DefDatabase) -> Arc { db.struct_data(self.id.into()).variant_data.clone() } @@ -352,15 +332,6 @@ impl Union { .collect() } - pub fn field(self, db: &impl HirDatabase, name: &Name) -> Option { - db.union_data(self.id) - .variant_data - .fields() - .iter() - .find(|(_id, data)| data.name == *name) - .map(|(id, _)| StructField { parent: self.into(), id }) - } - fn variant_data(self, db: &impl DefDatabase) -> Arc { db.union_data(self.id).variant_data.clone() } @@ -392,11 +363,6 @@ impl Enum { .collect() } - pub fn variant(self, db: &impl DefDatabase, name: &Name) -> Option { - let id = db.enum_data(self.id).variant(name)?; - Some(EnumVariant { parent: self, id }) - } - pub fn ty(self, db: &impl HirDatabase) -> Type { Type::from_def(db, self.id.module(db).krate, self.id) } @@ -428,14 +394,6 @@ impl EnumVariant { .collect() } - pub fn field(self, db: &impl HirDatabase, name: &Name) -> Option { - self.variant_data(db) - .fields() - .iter() - .find(|(_id, data)| data.name == *name) - .map(|(id, _)| StructField { parent: self.into(), id }) - } - pub(crate) fn variant_data(self, db: &impl DefDatabase) -> Arc { db.enum_data(self.parent.id).variants[self.id].variant_data.clone() } @@ -561,10 +519,6 @@ impl Function { db.body(self.id.into()) } - pub fn ty(self, db: &impl HirDatabase) -> Ty { - db.value_ty(self.id.into()) - } - pub fn infer(self, db: &impl HirDatabase) -> Arc { db.infer(self.id.into()) } diff --git a/crates/ra_hir/src/from_source.rs b/crates/ra_hir/src/from_source.rs index 071ca2e5a..307f3d5bf 100644 --- a/crates/ra_hir/src/from_source.rs +++ b/crates/ra_hir/src/from_source.rs @@ -216,8 +216,10 @@ impl Module { } }?; - let child_name = src.value.name()?; - parent_module.child(db, &child_name.as_name()) + let child_name = src.value.name()?.as_name(); + let def_map = db.crate_def_map(parent_module.id.krate); + let child_id = def_map[parent_module.id.local_id].children.get(&child_name)?; + Some(parent_module.with_module_id(*child_id)) } pub fn from_definition(db: &impl DefDatabase, src: InFile) -> Option { -- cgit v1.2.3