Use named fields for OpaqueTyOrigin

Author: compiler-errors

compiler/rustc_ast_lowering/src/lib.rs

@@ -1555,7 +1555,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
 .map(|(ident, id, _)| Lifetime{ id, ident })
 .collect()
 }
- hir::OpaqueTyOrigin::FnReturn(..) => {
+ hir::OpaqueTyOrigin::FnReturn{ .. } => {
 ifmatches!(
  fn_kind.expect("expected RPITs to be lowered with a FnKind"),
 FnDeclKind::Impl | FnDeclKind::Trait
@@ -1576,7 +1576,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  lifetime_collector::lifetimes_in_bounds(self.resolver, bounds)
 }
 }
- hir::OpaqueTyOrigin::AsyncFn(..) => {
+ hir::OpaqueTyOrigin::AsyncFn{ .. } => {
 unreachable!("should be using `lower_async_fn_ret_ty`")
 }
 }
@@ -1867,7 +1867,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  | FnDeclKind::Inherent
  | FnDeclKind::Trait
  | FnDeclKind::Impl => ImplTraitContext::OpaqueTy{
-origin: hir::OpaqueTyOrigin::FnReturn(self.local_def_id(fn_node_id)),
+origin: hir::OpaqueTyOrigin::FnReturn{
+parent:self.local_def_id(fn_node_id),
+},
 fn_kind:Some(kind),
 },
 FnDeclKind::ExternFn => {
@@ -1952,7 +1954,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
 
 let opaque_ty_ref = self.lower_opaque_inner(
  opaque_ty_node_id,
- hir::OpaqueTyOrigin::AsyncFn(fn_def_id),
+ hir::OpaqueTyOrigin::AsyncFn{parent:fn_def_id},
 matches!(fn_kind,FnDeclKind::Trait),
  captured_lifetimes,
  span,
@@ -1963,7 +1965,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  coro,
  opaque_ty_span,
 ImplTraitContext::OpaqueTy{
-origin: hir::OpaqueTyOrigin::FnReturn(fn_def_id),
+origin: hir::OpaqueTyOrigin::FnReturn{parent:fn_def_id},
 fn_kind:Some(fn_kind),
 },
 );

compiler/rustc_borrowck/src/region_infer/opaque_types.rs

@@ -503,8 +503,8 @@ impl<'tcx> LazyOpaqueTyEnv<'tcx> {
 let&Self{ tcx, def_id, .. } = self;
 let origin = tcx.opaque_type_origin(def_id);
 let parent = match origin {
- hir::OpaqueTyOrigin::FnReturn(parent)
- | hir::OpaqueTyOrigin::AsyncFn(parent)
+ hir::OpaqueTyOrigin::FnReturn{parent}
+ | hir::OpaqueTyOrigin::AsyncFn{parent}
  | hir::OpaqueTyOrigin::TyAlias{ parent, .. } => parent,
 };
 let param_env = tcx.param_env(parent);

compiler/rustc_hir/src/hir.rs

@@ -2806,9 +2806,15 @@ pub struct PreciseCapturingNonLifetimeArg {
 #[derive(Copy,Clone,PartialEq,Eq,Debug,HashStable_Generic)]
 pubenumOpaqueTyOrigin{
 /// `-> impl Trait`
-FnReturn(LocalDefId),
+FnReturn{
+/// The defining function.
+parent:LocalDefId,
+},
 /// `async fn`
-AsyncFn(LocalDefId),
+AsyncFn{
+/// The defining function.
+parent:LocalDefId,
+},
 /// type aliases: `type Foo = impl Trait;`
 TyAlias{
 /// The type alias or associated type parent of the TAIT/ATPIT

compiler/rustc_hir_analysis/src/check/check.rs

@@ -336,18 +336,18 @@ fn check_opaque_meets_bounds<'tcx>(
 origin:&hir::OpaqueTyOrigin,
 ) -> Result<(),ErrorGuaranteed>{
 let defining_use_anchor = match*origin {
- hir::OpaqueTyOrigin::FnReturn(did)
- | hir::OpaqueTyOrigin::AsyncFn(did)
- | hir::OpaqueTyOrigin::TyAlias{parent: did, .. } => did,
+ hir::OpaqueTyOrigin::FnReturn{ parent }
+ | hir::OpaqueTyOrigin::AsyncFn{ parent }
+ | hir::OpaqueTyOrigin::TyAlias{ parent, .. } => parent,
 };
 let param_env = tcx.param_env(defining_use_anchor);
 
 let infcx = tcx.infer_ctxt().with_opaque_type_inference(defining_use_anchor).build();
 let ocx = ObligationCtxt::new_with_diagnostics(&infcx);
 
 let args = match*origin {
- hir::OpaqueTyOrigin::FnReturn(parent)
- | hir::OpaqueTyOrigin::AsyncFn(parent)
+ hir::OpaqueTyOrigin::FnReturn{parent}
+ | hir::OpaqueTyOrigin::AsyncFn{parent}
  | hir::OpaqueTyOrigin::TyAlias{ parent, .. } => GenericArgs::identity_for_item(
  tcx, parent,
 )
@@ -409,7 +409,7 @@ fn check_opaque_meets_bounds<'tcx>(
 let outlives_env = OutlivesEnvironment::with_bounds(param_env, implied_bounds);
  ocx.resolve_regions_and_report_errors(defining_use_anchor,&outlives_env)?;
 
-iflet hir::OpaqueTyOrigin::FnReturn(..)| hir::OpaqueTyOrigin::AsyncFn(..) = origin {
+iflet hir::OpaqueTyOrigin::FnReturn{ .. }| hir::OpaqueTyOrigin::AsyncFn{ .. } = origin {
 // HACK: this should also fall through to the hidden type check below, but the original
 // implementation had a bug where equivalent lifetimes are not identical. This caused us
 // to reject existing stable code that is otherwise completely fine. The real fix is to
@@ -736,8 +736,8 @@ pub(crate) fn check_item_type(tcx: TyCtxt<'_>, def_id: LocalDefId) {
 check_opaque_precise_captures(tcx, def_id);
 
 let origin = tcx.opaque_type_origin(def_id);
-iflet hir::OpaqueTyOrigin::FnReturn(fn_def_id)
- | hir::OpaqueTyOrigin::AsyncFn(fn_def_id) = origin
+iflet hir::OpaqueTyOrigin::FnReturn{parent:fn_def_id}
+ | hir::OpaqueTyOrigin::AsyncFn{parent:fn_def_id} = origin
  && let hir::Node::TraitItem(trait_item) = tcx.hir_node_by_def_id(fn_def_id)
  && let(_, hir::TraitFn::Required(..)) = trait_item.expect_fn()
 {

compiler/rustc_hir_analysis/src/check/compare_impl_item/refine.rs

@@ -94,8 +94,8 @@ pub(super) fn check_refining_return_position_impl_trait_in_trait<'tcx>(
 if !tcx.hir().get_if_local(impl_opaque.def_id).is_some_and(|node| {
 matches!(
  node.expect_item().expect_opaque_ty().origin,
- hir::OpaqueTyOrigin::AsyncFn(def_id)| hir::OpaqueTyOrigin::FnReturn(def_id)
-ifdef_id == impl_m.def_id.expect_local()
+ hir::OpaqueTyOrigin::AsyncFn{ parent }| hir::OpaqueTyOrigin::FnReturn{ parent }
+ifparent == impl_m.def_id.expect_local()
 )
 }){
 report_mismatched_rpitit_signature(

compiler/rustc_hir_analysis/src/collect/generics_of.rs

@@ -210,7 +210,8 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
 Node::Item(item) => match item.kind{
 ItemKind::OpaqueTy(&hir::OpaqueTy{
 origin:
- hir::OpaqueTyOrigin::FnReturn(fn_def_id) | hir::OpaqueTyOrigin::AsyncFn(fn_def_id),
+ hir::OpaqueTyOrigin::FnReturn{parent: fn_def_id }
+ | hir::OpaqueTyOrigin::AsyncFn{parent: fn_def_id },
  in_trait,
  ..
 }) => {

compiler/rustc_hir_analysis/src/collect/item_bounds.rs

@@ -388,8 +388,8 @@ pub(super) fn explicit_item_bounds_with_filter(
  span,
  ..
 }) => {
-let(hir::OpaqueTyOrigin::FnReturn(fn_def_id)
- | hir::OpaqueTyOrigin::AsyncFn(fn_def_id)) = *origin
+let(hir::OpaqueTyOrigin::FnReturn{parent:fn_def_id}
+ | hir::OpaqueTyOrigin::AsyncFn{parent:fn_def_id}) = *origin
 else{
 span_bug!(*span,"RPITIT cannot be a TAIT, but got origin {origin:?}");
 };

compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

@@ -515,8 +515,8 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
 }
  hir::ItemKind::OpaqueTy(&hir::OpaqueTy{
 origin:
- hir::OpaqueTyOrigin::FnReturn(parent)
- | hir::OpaqueTyOrigin::AsyncFn(parent)
+ hir::OpaqueTyOrigin::FnReturn{parent}
+ | hir::OpaqueTyOrigin::AsyncFn{parent}
  | hir::OpaqueTyOrigin::TyAlias{ parent, .. },
  generics,
  ..

compiler/rustc_hir_analysis/src/collect/type_of.rs

@@ -618,7 +618,8 @@ pub(super) fn type_of_opaque(
 // Opaque types desugared from `impl Trait`.
 ItemKind::OpaqueTy(&OpaqueTy{
 origin:
- hir::OpaqueTyOrigin::FnReturn(owner) | hir::OpaqueTyOrigin::AsyncFn(owner),
+ hir::OpaqueTyOrigin::FnReturn{parent: owner }
+ | hir::OpaqueTyOrigin::AsyncFn{parent: owner },
  in_trait,
  ..
 }) => {

compiler/rustc_hir_typeck/src/_match.rs

@@ -602,7 +602,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 .map(|(k, _)| (k.def_id, k.args))?,
  _ => returnNone,
 };
-let hir::OpaqueTyOrigin::FnReturn(parent_def_id) = self.tcx.opaque_type_origin(def_id)
+let hir::OpaqueTyOrigin::FnReturn{parent: parent_def_id } =
+self.tcx.opaque_type_origin(def_id)
 else{
 returnNone;
 };