Skip to content

Commit a5cd3bd

Browse files
oli-obkoli-obk
committed
Ensure no one constructs AliasTys themselves
1 parent 4ffe3bd commit a5cd3bd

File tree

50 files changed

+104
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+104
-106
lines changed

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
697697
.map_bound(|p| p.predicates),
698698
None,
699699
),
700-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) => {
700+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => {
701701
find_fn_kind_from_did(tcx.bound_explicit_item_bounds(*def_id), Some(*substs))
702702
}
703703
ty::Closure(_, substs) => match substs.as_closure().kind() {

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
504504
let ErrorConstraintInfo { outlived_fr, span, .. } = errci;
505505

506506
let mut output_ty = self.regioncx.universal_regions().unnormalized_output_ty;
507-
if let ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }) = *output_ty.kind() {
507+
if let ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }) = *output_ty.kind() {
508508
output_ty = self.infcx.tcx.type_of(def_id)
509509
};
510510

‎compiler/rustc_const_eval/src/transform/validate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
241241
};
242242

243243
let kind = match parent_ty.ty.kind() {
244-
&ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) => {
244+
&ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => {
245245
self.tcx.bound_type_of(def_id).subst(self.tcx, substs).kind()
246246
}
247247
kind => kind,

‎compiler/rustc_const_eval/src/util/type_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl<'tcx> Printer<'tcx> for AbsolutePathPrinter<'tcx> {
5858
// Types with identity (print the module path).
5959
ty::Adt(ty::AdtDef(Interned(&ty::AdtDefData { did: def_id, .. }, _)), substs)
6060
| ty::FnDef(def_id, substs)
61-
| ty::Alias(_, ty::AliasTy { def_id, substs })
61+
| ty::Alias(_, ty::AliasTy { def_id, substs, .. })
6262
| ty::Closure(def_id, substs)
6363
| ty::Generator(def_id, substs, _) => self.print_def_path(def_id, substs),
6464
ty::Foreign(def_id) => self.print_def_path(def_id, &[]),

‎compiler/rustc_hir_analysis/src/check/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ fn opaque_type_cycle_error(tcx: TyCtxt<'_>, def_id: LocalDefId, span: Span) -> E
14401440
impl<'tcx> ty::visit::TypeVisitor<'tcx> for OpaqueTypeCollector {
14411441
fn visit_ty(&mut self, t: Ty<'tcx>) -> ControlFlow<Self::BreakTy> {
14421442
match *t.kind() {
1443-
ty::Alias(ty::Opaque, ty::AliasTy { def_id: def, substs: _ }) => {
1443+
ty::Alias(ty::Opaque, ty::AliasTy { def_id: def, .. }) => {
14441444
self.0.push(def);
14451445
ControlFlow::CONTINUE
14461446
}

‎compiler/rustc_hir_analysis/src/variance/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn variance_of_opaque(tcx: TyCtxt<'_>, item_def_id: LocalDefId) -> &[ty::Varianc
111111
#[instrument(level = "trace", skip(self), ret)]
112112
fn visit_ty(&mut self, t: Ty<'tcx>) -> ControlFlow<Self::BreakTy> {
113113
match t.kind() {
114-
ty::Alias(_, ty::AliasTy { def_id, substs })
114+
ty::Alias(_, ty::AliasTy { def_id, substs, .. })
115115
if matches!(
116116
self.tcx.def_kind(*def_id),
117117
DefKind::OpaqueTy | DefKind::ImplTraitPlaceholder
@@ -169,7 +169,7 @@ fn variance_of_opaque(tcx: TyCtxt<'_>, item_def_id: LocalDefId) -> &[ty::Varianc
169169
}
170170
}
171171
ty::PredicateKind::Clause(ty::Clause::Projection(ty::ProjectionPredicate {
172-
projection_ty: ty::AliasTy { substs, def_id: _ },
172+
projection_ty: ty::AliasTy { substs, .. },
173173
term,
174174
})) => {
175175
for subst in &substs[1..] {

‎compiler/rustc_hir_typeck/src/_match.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
518518

519519
let substs = sig.output().walk().find_map(|arg| {
520520
if let ty::GenericArgKind::Type(ty) = arg.unpack()
521-
&& let ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) = *ty.kind()
521+
&& let ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) = *ty.kind()
522522
&& def_id == rpit_def_id
523523
{
524524
Some(substs)

‎compiler/rustc_hir_typeck/src/closure.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
167167
expected_ty: Ty<'tcx>,
168168
) -> (Option<ExpectedSig<'tcx>>, Option<ty::ClosureKind>) {
169169
match *expected_ty.kind() {
170-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) => self
170+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => self
171171
.deduce_signature_from_predicates(
172172
self.tcx.bound_explicit_item_bounds(def_id).subst_iter_copied(self.tcx, substs),
173173
),
@@ -678,7 +678,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
678678
get_future_output(obligation.predicate, obligation.cause.span)
679679
})?
680680
}
681-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) => self
681+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => self
682682
.tcx
683683
.bound_explicit_item_bounds(def_id)
684684
.subst_iter_copied(self.tcx, substs)

‎compiler/rustc_hir_typeck/src/coercion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1805,7 +1805,7 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
18051805
{
18061806
let ty = <dyn AstConv<'_>>::ast_ty_to_ty(fcx, ty);
18071807
// Get the `impl Trait`'s `DefId`.
1808-
if let ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }) = ty.kind()
1808+
if let ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }) = ty.kind()
18091809
// Get the `impl Trait`'s `Item` so that we can get its trait bounds and
18101810
// get the `Trait`'s `DefId`.
18111811
&& let hir::ItemKind::OpaqueTy(hir::OpaqueTy { bounds, .. }) =

‎compiler/rustc_hir_typeck/src/expr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
23912391
ty::Param(param_ty) => {
23922392
self.point_at_param_definition(&mut err, param_ty);
23932393
}
2394-
ty::Alias(ty::Opaque, ty::AliasTy { def_id: _, substs: _ }) => {
2394+
ty::Alias(ty::Opaque, _) => {
23952395
self.suggest_await_on_field_access(&mut err, ident, base, base_ty.peel_refs());
23962396
}
23972397
_ => {}

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
716716
if formal_ret.has_infer_types() {
717717
for ty in ret_ty.walk() {
718718
if let ty::subst::GenericArgKind::Type(ty) = ty.unpack()
719-
&& let ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }) = *ty.kind()
719+
&& let ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }) = *ty.kind()
720720
&& let Some(def_id) = def_id.as_local()
721721
&& self.opaque_type_origin(def_id, DUMMY_SP).is_some() {
722722
return None;

‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
21242124
}
21252125
}
21262126
}
2127-
ty::Alias(ty::Opaque, ty::AliasTy { def_id: new_def_id, substs: _ })
2127+
ty::Alias(ty::Opaque, ty::AliasTy { def_id: new_def_id, .. })
21282128
| ty::Closure(new_def_id, _)
21292129
| ty::FnDef(new_def_id, _) => {
21302130
def_id = new_def_id;

‎compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
174174
let fn_sig = substs.as_closure().sig();
175175
Some((DefIdOrName::DefId(def_id), fn_sig.output(), fn_sig.inputs().map_bound(|inputs| &inputs[1..])))
176176
}
177-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) => {
177+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => {
178178
self.tcx.bound_item_bounds(def_id).subst(self.tcx, substs).iter().find_map(|pred| {
179179
if let ty::PredicateKind::Clause(ty::Clause::Projection(proj)) = pred.kind().skip_binder()
180180
&& Some(proj.projection_ty.def_id) == self.tcx.lang_items().fn_once_output()

‎compiler/rustc_hir_typeck/src/generator_interior/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ fn check_must_not_suspend_ty<'tcx>(
563563
}
564564
ty::Adt(def, _) => check_must_not_suspend_def(fcx.tcx, def.did(), hir_id, data),
565565
// FIXME: support adding the attribute to TAITs
566-
ty::Alias(ty::Opaque, ty::AliasTy { def_id: def, substs: _ }) => {
566+
ty::Alias(ty::Opaque, ty::AliasTy { def_id: def, .. }) => {
567567
let mut has_emitted = false;
568568
for &(predicate, _) in fcx.tcx.explicit_item_bounds(def) {
569569
// We only look at the `DefId`, so it is safe to skip the binder here.

‎compiler/rustc_hir_typeck/src/writeback.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
546546
impl<'tcx> ty::TypeVisitor<'tcx> for RecursionChecker {
547547
type BreakTy = ();
548548
fn visit_ty(&mut self, t: Ty<'tcx>) -> ControlFlow<Self::BreakTy> {
549-
if let ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }) = *t.kind() {
549+
if let ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }) = *t.kind() {
550550
if def_id == self.def_id.to_def_id() {
551551
return ControlFlow::Break(());
552552
}

‎compiler/rustc_infer/src/infer/combine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
675675
// relatable.
676676
Ok(t)
677677
}
678-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) => {
678+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => {
679679
let s = self.relate(substs, substs)?;
680680
Ok(if s == substs { t } else { self.infcx.tcx.mk_opaque(def_id, s) })
681681
}

‎compiler/rustc_infer/src/infer/equate.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ impl<'tcx> TypeRelation<'tcx> for Equate<'_, '_, 'tcx> {
101101
}
102102

103103
(
104-
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: a_def_id, substs: _ }),
105-
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, substs: _ }),
104+
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: a_def_id, .. }),
105+
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, .. }),
106106
) if a_def_id == b_def_id => {
107107
self.fields.infcx.super_combine_tys(self, a, b)?;
108108
}
109-
(&ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }), _)
110-
| (_, &ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }))
109+
(&ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }), _)
110+
| (_, &ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }))
111111
if self.fields.define_opaque_types && def_id.is_local() =>
112112
{
113113
self.fields.obligations.extend(

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ pub fn unexpected_hidden_region_diagnostic<'tcx>(
339339
impl<'tcx> InferCtxt<'tcx> {
340340
pub fn get_impl_future_output_ty(&self, ty: Ty<'tcx>) -> Option<Ty<'tcx>> {
341341
let (def_id, substs) = match *ty.kind() {
342-
ty::Alias(_, ty::AliasTy { def_id, substs })
342+
ty::Alias(_, ty::AliasTy { def_id, substs, .. })
343343
if matches!(
344344
self.tcx.def_kind(def_id),
345345
DefKind::OpaqueTy | DefKind::ImplTraitPlaceholder
@@ -2767,9 +2767,7 @@ impl TyCategory {
27672767
pub fn from_ty(tcx: TyCtxt<'_>, ty: Ty<'_>) -> Option<(Self, DefId)> {
27682768
match *ty.kind() {
27692769
ty::Closure(def_id, _) => Some((Self::Closure, def_id)),
2770-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }) => {
2771-
Some((Self::Opaque, def_id))
2772-
}
2770+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }) => Some((Self::Opaque, def_id)),
27732771
ty::Generator(def_id, ..) => {
27742772
Some((Self::Generator(tcx.generator_kind(def_id).unwrap()), def_id))
27752773
}

‎compiler/rustc_infer/src/infer/error_reporting/suggest.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,12 +487,12 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
487487
StatementAsExpression::CorrectType
488488
}
489489
(
490-
ty::Alias(ty::Opaque, ty::AliasTy { def_id: last_def_id, substs: _ }),
491-
ty::Alias(ty::Opaque, ty::AliasTy { def_id: exp_def_id, substs: _ }),
490+
ty::Alias(ty::Opaque, ty::AliasTy { def_id: last_def_id, .. }),
491+
ty::Alias(ty::Opaque, ty::AliasTy { def_id: exp_def_id, .. }),
492492
) if last_def_id == exp_def_id => StatementAsExpression::CorrectType,
493493
(
494-
ty::Alias(ty::Opaque, ty::AliasTy { def_id: last_def_id, substs: last_bounds }),
495-
ty::Alias(ty::Opaque, ty::AliasTy { def_id: exp_def_id, substs: exp_bounds }),
494+
ty::Alias(ty::Opaque, ty::AliasTy { def_id: last_def_id, substs: last_bounds, .. }),
495+
ty::Alias(ty::Opaque, ty::AliasTy { def_id: exp_def_id, substs: exp_bounds, .. }),
496496
) => {
497497
debug!(
498498
"both opaque, likely future {:?} {:?} {:?} {:?}",

‎compiler/rustc_infer/src/infer/lattice.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ where
106106
}
107107

108108
(
109-
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: a_def_id, substs: _ }),
110-
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, substs: _ }),
109+
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: a_def_id, .. }),
110+
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, .. }),
111111
) if a_def_id == b_def_id => infcx.super_combine_tys(this, a, b),
112-
(&ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }), _)
113-
| (_, &ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }))
112+
(&ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }), _)
113+
| (_, &ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }))
114114
if this.define_opaque_types() && def_id.is_local() =>
115115
{
116116
this.add_obligations(

‎compiler/rustc_infer/src/infer/nll_relate/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -611,17 +611,17 @@ where
611611
(&ty::Infer(ty::TyVar(vid)), _) => self.relate_ty_var((vid, b)),
612612

613613
(
614-
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: a_def_id, substs: _ }),
615-
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, substs: _ }),
614+
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: a_def_id, .. }),
615+
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, .. }),
616616
) if a_def_id == b_def_id => infcx.super_combine_tys(self, a, b).or_else(|err| {
617617
self.tcx().sess.delay_span_bug(
618618
self.delegate.span(),
619619
"failure to relate an opaque to itself should result in an error later on",
620620
);
621621
if a_def_id.is_local() { self.relate_opaques(a, b) } else { Err(err) }
622622
}),
623-
(&ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }), _)
624-
| (_, &ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }))
623+
(&ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }), _)
624+
| (_, &ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }))
625625
if def_id.is_local() =>
626626
{
627627
self.relate_opaques(a, b)

‎compiler/rustc_infer/src/infer/opaque_types.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl<'tcx> InferCtxt<'tcx> {
6666
lt_op: |lt| lt,
6767
ct_op: |ct| ct,
6868
ty_op: |ty| match *ty.kind() {
69-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ })
69+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. })
7070
if replace_opaque_type(def_id) =>
7171
{
7272
let def_span = self.tcx.def_span(def_id);
@@ -106,7 +106,7 @@ impl<'tcx> InferCtxt<'tcx> {
106106
}
107107
let (a, b) = if a_is_expected { (a, b) } else { (b, a) };
108108
let process = |a: Ty<'tcx>, b: Ty<'tcx>, a_is_expected| match *a.kind() {
109-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) if def_id.is_local() => {
109+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) if def_id.is_local() => {
110110
let def_id = def_id.expect_local();
111111
let origin = match self.defining_use_anchor {
112112
DefiningAnchor::Bind(_) => {
@@ -149,9 +149,7 @@ impl<'tcx> InferCtxt<'tcx> {
149149
DefiningAnchor::Bubble => self.opaque_ty_origin_unchecked(def_id, cause.span),
150150
DefiningAnchor::Error => return None,
151151
};
152-
if let ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, substs: _ }) =
153-
*b.kind()
154-
{
152+
if let ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, .. }) = *b.kind() {
155153
// We could accept this, but there are various ways to handle this situation, and we don't
156154
// want to make a decision on it right now. Likely this case is so super rare anyway, that
157155
// no one encounters it in practice.
@@ -480,7 +478,7 @@ where
480478
substs.as_generator().resume_ty().visit_with(self);
481479
}
482480

483-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, ref substs }) => {
481+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, ref substs, .. }) => {
484482
// Skip lifetime paramters that are not captures.
485483
let variances = self.tcx.variances_of(*def_id);
486484

@@ -583,17 +581,16 @@ impl<'tcx> InferCtxt<'tcx> {
583581
}
584582
// Replace all other mentions of the same opaque type with the hidden type,
585583
// as the bounds must hold on the hidden type after all.
586-
ty::Alias(ty::Opaque, ty::AliasTy { def_id: def_id2, substs: substs2 })
584+
ty::Alias(ty::Opaque, ty::AliasTy { def_id: def_id2, substs: substs2, .. })
587585
if def_id.to_def_id() == def_id2 && substs == substs2 =>
588586
{
589587
hidden_ty
590588
}
591589
// FIXME(RPITIT): This can go away when we move to associated types
592-
ty::Alias(ty::Projection, ty::AliasTy { def_id: def_id2, substs: substs2 })
593-
if def_id.to_def_id() == def_id2 && substs == substs2 =>
594-
{
595-
hidden_ty
596-
}
590+
ty::Alias(
591+
ty::Projection,
592+
ty::AliasTy { def_id: def_id2, substs: substs2, .. },
593+
) if def_id.to_def_id() == def_id2 && substs == substs2 => hidden_ty,
597594
_ => ty,
598595
},
599596
lt_op: |lt| lt,

‎compiler/rustc_infer/src/infer/outlives/components.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fn compute_components<'tcx>(
130130
// outlives any other lifetime, which is unsound.
131131
// See https://github.com/rust-lang/rust/issues/84305 for
132132
// more details.
133-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) => {
133+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => {
134134
out.push(Component::Opaque(def_id, substs));
135135
},
136136

‎compiler/rustc_infer/src/infer/outlives/obligations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ where
338338
substs,
339339
true,
340340
|ty| match *ty.kind() {
341-
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs }) => (def_id, substs),
341+
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => (def_id, substs),
342342
_ => bug!("expected only projection types from env, not {:?}", ty),
343343
},
344344
);

‎compiler/rustc_infer/src/infer/sub.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ impl<'tcx> TypeRelation<'tcx> for Sub<'_, '_, 'tcx> {
131131
}
132132

133133
(
134-
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: a_def_id, substs: _ }),
135-
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, substs: _ }),
134+
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: a_def_id, .. }),
135+
&ty::Alias(ty::Opaque, ty::AliasTy { def_id: b_def_id, .. }),
136136
) if a_def_id == b_def_id => {
137137
self.fields.infcx.super_combine_tys(self, a, b)?;
138138
Ok(a)
139139
}
140-
(&ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }), _)
141-
| (_, &ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs: _ }))
140+
(&ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }), _)
141+
| (_, &ty::Alias(ty::Opaque, ty::AliasTy { def_id, .. }))
142142
if self.fields.define_opaque_types && def_id.is_local() =>
143143
{
144144
self.fields.obligations.extend(

0 commit comments

Comments
 (0)