Skip to content

Commit a8847df

Browse files
borsbors
committed
Auto merge of #105657 - oli-obk:mk_projection_ty, r=lcnr
Guard ProjectionTy creation against passing the wrong number of substs r? `@lcnr`
2 parents 939a3dd + b41a483 commit a8847df

File tree

71 files changed

+262
-282
lines changed

Some content is hidden

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

71 files changed

+262
-282
lines changed

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

+1-1
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

+1-1
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

+1-1
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

+1-1
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/astconv/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
680680
let assoc_bindings = self.create_assoc_bindings_for_generic_args(args);
681681

682682
let poly_trait_ref =
683-
ty::Binder::bind_with_vars(ty::TraitRef::new(trait_def_id, substs), bound_vars);
683+
ty::Binder::bind_with_vars(tcx.mk_trait_ref(trait_def_id, substs), bound_vars);
684684

685685
debug!(?poly_trait_ref, ?assoc_bindings);
686686
bounds.trait_bounds.push((poly_trait_ref, span, constness));
@@ -813,7 +813,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
813813
if let Some(b) = trait_segment.args().bindings.first() {
814814
Self::prohibit_assoc_ty_binding(self.tcx(), b.span);
815815
}
816-
ty::TraitRef::new(trait_def_id, substs)
816+
self.tcx().mk_trait_ref(trait_def_id, substs)
817817
}
818818

819819
#[instrument(level = "debug", skip(self, span))]
@@ -1146,7 +1146,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
11461146

11471147
debug!(?substs_trait_ref_and_assoc_item);
11481148

1149-
ty::AliasTy { def_id: assoc_item.def_id, substs: substs_trait_ref_and_assoc_item }
1149+
self.tcx().mk_alias_ty(assoc_item.def_id, substs_trait_ref_and_assoc_item)
11501150
});
11511151

11521152
if !speculative {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, id: hir::ItemId) {
570570
assoc_item,
571571
assoc_item,
572572
default.span,
573-
ty::TraitRef { def_id: it.owner_id.to_def_id(), substs: trait_substs },
573+
tcx.mk_trait_ref(it.owner_id.to_def_id(), trait_substs),
574574
);
575575
}
576576
_ => {}
@@ -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/check/compare_method.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1746,10 +1746,7 @@ pub fn check_type_bounds<'tcx>(
17461746
_ => predicates.push(
17471747
ty::Binder::bind_with_vars(
17481748
ty::ProjectionPredicate {
1749-
projection_ty: ty::AliasTy {
1750-
def_id: trait_ty.def_id,
1751-
substs: rebased_substs,
1752-
},
1749+
projection_ty: tcx.mk_alias_ty(trait_ty.def_id, rebased_substs),
17531750
term: impl_ty_value.into(),
17541751
},
17551752
bound_vars,

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

+3-3
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
@@ -160,7 +160,7 @@ fn variance_of_opaque(tcx: TyCtxt<'_>, item_def_id: LocalDefId) -> &[ty::Varianc
160160
// instead of requiring an additional `+ 'a`.
161161
match pred.kind().skip_binder() {
162162
ty::PredicateKind::Clause(ty::Clause::Trait(ty::TraitPredicate {
163-
trait_ref: ty::TraitRef { def_id: _, substs },
163+
trait_ref: ty::TraitRef { def_id: _, substs, .. },
164164
constness: _,
165165
polarity: _,
166166
})) => {
@@ -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

+3-6
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)
@@ -542,15 +542,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
542542
ty::PredicateKind::Clause(ty::Clause::Trait(trait_pred)) => {
543543
assert_eq!(trait_pred.trait_ref.self_ty(), opaque_ty);
544544
ty::PredicateKind::Clause(ty::Clause::Trait(
545-
trait_pred.with_self_type(self.tcx, ty),
545+
trait_pred.with_self_ty(self.tcx, ty),
546546
))
547547
}
548548
ty::PredicateKind::Clause(ty::Clause::Projection(mut proj_pred)) => {
549549
assert_eq!(proj_pred.projection_ty.self_ty(), opaque_ty);
550-
proj_pred.projection_ty.substs = self.tcx.mk_substs_trait(
551-
ty,
552-
proj_pred.projection_ty.substs.iter().skip(1),
553-
);
550+
proj_pred = proj_pred.with_self_ty(self.tcx, ty);
554551
ty::PredicateKind::Clause(ty::Clause::Projection(proj_pred))
555552
}
556553
_ => continue,

‎compiler/rustc_hir_typeck/src/closure.rs

+2-2
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

+1-1
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

+1-1
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

+1-1
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

+9-13
Original file line numberDiff line numberDiff line change
@@ -2124,27 +2124,23 @@ 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;
21312131
}
21322132
_ => {
21332133
// Look for a user-provided impl of a `Fn` trait, and point to it.
21342134
let new_def_id = self.probe(|_| {
2135-
let trait_ref = ty::TraitRef::new(
2135+
let trait_ref = self.tcx.mk_trait_ref(
21362136
call_kind.to_def_id(self.tcx),
2137-
self.tcx.mk_substs(
2138-
[
2139-
ty::GenericArg::from(callee_ty),
2140-
self.next_ty_var(TypeVariableOrigin {
2141-
kind: TypeVariableOriginKind::MiscVariable,
2142-
span: rustc_span::DUMMY_SP,
2143-
})
2144-
.into(),
2145-
]
2146-
.into_iter(),
2147-
),
2137+
[
2138+
callee_ty,
2139+
self.next_ty_var(TypeVariableOrigin {
2140+
kind: TypeVariableOriginKind::MiscVariable,
2141+
span: rustc_span::DUMMY_SP,
2142+
}),
2143+
],
21482144
);
21492145
let obligation = traits::Obligation::new(
21502146
self.tcx,

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

+11-13
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_hir_analysis::astconv::AstConv;
1313
use rustc_infer::infer;
1414
use rustc_infer::traits::{self, StatementAsExpression};
1515
use rustc_middle::lint::in_external_macro;
16-
use rustc_middle::ty::{self, Binder, DefIdTree, IsSuggestable, ToPredicate, Ty};
16+
use rustc_middle::ty::{self, Binder, DefIdTree, IsSuggestable, Ty};
1717
use rustc_session::errors::ExprParenthesesNeeded;
1818
use rustc_span::symbol::sym;
1919
use rustc_span::Span;
@@ -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()
@@ -1277,17 +1277,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
12771277
// Check that we're in fact trying to clone into the expected type
12781278
&& self.can_coerce(*pointee_ty, expected_ty)
12791279
// And the expected type doesn't implement `Clone`
1280-
&& !self.predicate_must_hold_considering_regions(&traits::Obligation {
1281-
cause: traits::ObligationCause::dummy(),
1282-
param_env: self.param_env,
1283-
recursion_depth: 0,
1284-
predicate: ty::Binder::dummy(ty::TraitRef {
1285-
def_id: clone_trait_did,
1286-
substs: self.tcx.mk_substs([expected_ty.into()].iter()),
1287-
})
1288-
.without_const()
1289-
.to_predicate(self.tcx),
1290-
})
1280+
&& !self.predicate_must_hold_considering_regions(&traits::Obligation::new(
1281+
self.tcx,
1282+
traits::ObligationCause::dummy(),
1283+
self.param_env,
1284+
ty::Binder::dummy(self.tcx.mk_trait_ref(
1285+
clone_trait_did,
1286+
[expected_ty],
1287+
)),
1288+
))
12911289
{
12921290
diag.span_note(
12931291
callee_expr.span,

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

+1-1
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/method/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
285285
self.var_for_def(span, param)
286286
});
287287

288-
let trait_ref = ty::TraitRef::new(trait_def_id, substs);
288+
let trait_ref = self.tcx.mk_trait_ref(trait_def_id, substs);
289289

290290
// Construct an obligation
291291
let poly_trait_ref = ty::Binder::dummy(trait_ref);
@@ -326,7 +326,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
326326
self.var_for_def(span, param)
327327
});
328328

329-
let trait_ref = ty::TraitRef::new(trait_def_id, substs);
329+
let trait_ref = self.tcx.mk_trait_ref(trait_def_id, substs);
330330

331331
// Construct an obligation
332332
let poly_trait_ref = ty::Binder::dummy(trait_ref);

‎compiler/rustc_hir_typeck/src/method/probe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
920920
) {
921921
debug!("assemble_extension_candidates_for_trait(trait_def_id={:?})", trait_def_id);
922922
let trait_substs = self.fresh_item_substs(trait_def_id);
923-
let trait_ref = ty::TraitRef::new(trait_def_id, trait_substs);
923+
let trait_ref = self.tcx.mk_trait_ref(trait_def_id, trait_substs);
924924

925925
if self.tcx.is_trait_alias(trait_def_id) {
926926
// For trait aliases, assume all supertraits are relevant.

‎compiler/rustc_hir_typeck/src/method/suggest.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -557,10 +557,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
557557
.chain(projection_ty.substs.iter().skip(1)),
558558
);
559559

560-
let quiet_projection_ty = ty::AliasTy {
561-
substs: substs_with_infer_self,
562-
def_id: projection_ty.def_id,
563-
};
560+
let quiet_projection_ty =
561+
tcx.mk_alias_ty(projection_ty.def_id, substs_with_infer_self);
564562

565563
let term = pred.skip_binder().term;
566564

‎compiler/rustc_hir_typeck/src/writeback.rs

+1-1
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

+1-1
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

+4-4
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(

0 commit comments

Comments
 (0)