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

Make the Resolution variants tuple variants

Browse Source
This commit is contained in:
Florian Diebold
2019-01-30 22:41:44 +01:00
parent d3df80dfe4
commit d571d26955
7 changed files with 41 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,9 +90,8 @@ impl ImplBlock {
pub fn target_trait(&self, db: &impl HirDatabase) -> Option<Trait> {
if let Some(TypeRef::Path(path)) = self.target_trait_ref() {
let resolver = self.resolver(db);
if let Some(Resolution::Def {
def: ModuleDef::Trait(tr),
}) = resolver.resolve_path(db, path).take_types()
if let Some(Resolution::Def(ModuleDef::Trait(tr))) =
resolver.resolve_path(db, path).take_types()
{
return Some(tr);
}
@@ -106,7 +105,7 @@ impl ImplBlock {
pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
let r = self.module().resolver(db);
// FIXME: add generics
// TODO: add generics
let r = r.push_impl_block_scope(self.clone());
r
}