bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename impl_trait_in_trait_parent to impl_trait_in_trait_parent_fn

Browse source
This commit is contained in:
Santiago Pastorino 2023-03-10 17:48:11 -03:00
parent e4b9f86054
commit 26c4c1ea97
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
9 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/src/ty/mod.rs
View file

@ -2552,7 +2552,7 @@ impl<'tcx> TyCtxt<'tcx> {
matches!(self.trait_of_item(def_id), Some(trait_id) if self.has_attr(trait_id, sym::const_trait))
}
pub fn impl_trait_in_trait_parent(self, mut def_id: DefId) -> DefId {
pub fn impl_trait_in_trait_parent_fn(self, mut def_id: DefId) -> DefId {
while let def_kind = self.def_kind(def_id) && def_kind != DefKind::AssocFn {
debug_assert_eq!(def_kind, DefKind::ImplTraitPlaceholder);
def_id = self.parent(def_id);

2
compiler/rustc_middle/src/ty/sty.rs
View file

@ -1288,7 +1288,7 @@ impl<'tcx> AliasTy<'tcx> {
match tcx.def_kind(self.def_id) {
DefKind::AssocTy | DefKind::AssocConst => tcx.parent(self.def_id),
DefKind::ImplTraitPlaceholder => {
tcx.parent(tcx.impl_trait_in_trait_parent(self.def_id))
tcx.parent(tcx.impl_trait_in_trait_parent_fn(self.def_id))
}
kind => bug!("expected a projection AliasTy; found {kind:?}"),
}