diff options
Diffstat (limited to 'compiler/rustc_ty_utils/src')
| -rw-r--r-- | compiler/rustc_ty_utils/src/assoc.rs | 8 | ||||
| -rw-r--r-- | compiler/rustc_ty_utils/src/ty.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_ty_utils/src/assoc.rs b/compiler/rustc_ty_utils/src/assoc.rs index e9629e31482..8587c952b91 100644 --- a/compiler/rustc_ty_utils/src/assoc.rs +++ b/compiler/rustc_ty_utils/src/assoc.rs @@ -101,7 +101,7 @@ fn associated_item_from_trait_item( kind, def_id: owner_id.to_def_id(), trait_item_def_id: Some(owner_id.to_def_id()), - container: ty::AssocItemContainer::Trait, + container: ty::AssocContainer::Trait, } } @@ -122,7 +122,7 @@ fn associated_item_from_impl_item(tcx: TyCtxt<'_>, impl_item: &hir::ImplItem<'_> kind, def_id: owner_id.to_def_id(), trait_item_def_id: impl_item.trait_item_def_id, - container: ty::AssocItemContainer::Impl, + container: ty::AssocContainer::Impl, } } struct RPITVisitor<'a, 'tcx> { @@ -257,7 +257,7 @@ fn associated_type_for_impl_trait_in_trait( }, def_id, trait_item_def_id: None, - container: ty::AssocItemContainer::Trait, + container: ty::AssocContainer::Trait, }); // Copy visility of the containing function. @@ -323,7 +323,7 @@ fn associated_type_for_impl_trait_in_impl( }, def_id, trait_item_def_id: Some(trait_assoc_def_id), - container: ty::AssocItemContainer::Impl, + container: ty::AssocContainer::Impl, }); // Copy visility of the containing function. diff --git a/compiler/rustc_ty_utils/src/ty.rs b/compiler/rustc_ty_utils/src/ty.rs index b22c326b9f2..31512571538 100644 --- a/compiler/rustc_ty_utils/src/ty.rs +++ b/compiler/rustc_ty_utils/src/ty.rs @@ -165,7 +165,7 @@ fn param_env(tcx: TyCtxt<'_>, def_id: DefId) -> ty::ParamEnv<'_> { if tcx.def_kind(def_id) == DefKind::AssocFn && let assoc_item = tcx.associated_item(def_id) - && assoc_item.container == ty::AssocItemContainer::Trait + && assoc_item.container == ty::AssocContainer::Trait && assoc_item.defaultness(tcx).has_value() { let sig = tcx.fn_sig(def_id).instantiate_identity(); |