rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Get substs for trait refs in impl blocks

Browse Source
This commit is contained in:
Florian Diebold
2019-03-26 23:07:26 +01:00
parent 23b876bc3b
commit 413c87f155
6 changed files with 85 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/ra_hir/src/impl_block.rs
View File

@@ -10,15 +10,13 @@ use ra_syntax::{
use crate::{
Const, TypeAlias, Function, HirFileId,
HirDatabase, DefDatabase,
ModuleDef, Trait, Resolution,
type_ref::TypeRef,
ids::LocationCtx,
resolve::Resolver,
ty::Ty, generics::GenericParams,
TraitRef, code_model_api::{Module, ModuleSource}
};
use crate::code_model_api::{Module, ModuleSource};
#[derive(Debug, Default, PartialEq, Eq)]
pub struct ImplSourceMap {
map: ArenaMap<ImplId, AstPtr<ast::ImplBlock>>,
@@ -73,7 +71,7 @@ impl ImplBlock {
self.module
}
pub fn target_trait_ref(&self, db: &impl DefDatabase) -> Option<TypeRef> {
pub fn target_trait(&self, db: &impl DefDatabase) -> Option<TypeRef> {
db.impls_in_module(self.module).impls[self.impl_id].target_trait().cloned()
}
@@ -85,16 +83,8 @@ impl ImplBlock {
Ty::from_hir(db, &self.resolver(db), &self.target_type(db))
}
pub fn target_trait(&self, db: &impl HirDatabase) -> Option<Trait> {
if let Some(TypeRef::Path(path)) = self.target_trait_ref(db) {
let resolver = self.resolver(db);
if let Some(Resolution::Def(ModuleDef::Trait(tr))) =
resolver.resolve_path(db, &path).take_types()
{
return Some(tr);
}
}
None
pub fn target_trait_ref(&self, db: &impl HirDatabase) -> Option<TraitRef> {
TraitRef::from_hir(db, &self.resolver(db), &self.target_trait(db)?)
}
pub fn items(&self, db: &impl DefDatabase) -> Vec<ImplItem> {