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

Rename ContainerId -> AssocContainerId

Browse Source
This commit is contained in:
Aleksey Kladov
2019-12-20 11:59:50 +01:00
parent 67c2aea182
commit 8fc20b6503
11 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ra_hir_ty/src/utils.rs
View File

@@ -9,7 +9,7 @@ use hir_def::{
path::Path,
resolver::{HasResolver, TypeNs},
type_ref::TypeRef,
ContainerId, GenericDefId, Lookup, TraitId, TypeAliasId, TypeParamId, VariantId,
AssocContainerId, GenericDefId, Lookup, TraitId, TypeAliasId, TypeParamId, VariantId,
};
use hir_expand::name::{name, Name};
@@ -155,8 +155,8 @@ fn parent_generic_def(db: &impl DefDatabase, def: GenericDefId) -> Option<Generi
};
match container {
ContainerId::ImplId(it) => Some(it.into()),
ContainerId::TraitId(it) => Some(it.into()),
ContainerId::ModuleId(_) | ContainerId::DefWithBodyId(_) => None,
AssocContainerId::ImplId(it) => Some(it.into()),
AssocContainerId::TraitId(it) => Some(it.into()),
AssocContainerId::ModuleId(_) | AssocContainerId::DefWithBodyId(_) => None,
}
}