Skip to content

Commit aa1653e

Browse files
Rename coroutine_stalled_predicates
1 parent ccfcd95 commit aa1653e

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

compiler/rustc_hir_analysis/src/check/check.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1552,8 +1552,8 @@ pub(super) fn check_coroutine_obligations(
15521552
let typeck = tcx.typeck(def_id);
15531553
let param_env = tcx.param_env(typeck.hir_owner.def_id);
15541554

1555-
let coroutine_interior_predicates = &typeck.coroutine_interior_predicates[&def_id];
1556-
debug!(?coroutine_interior_predicates);
1555+
let coroutine_stalled_predicates = &typeck.coroutine_stalled_predicates[&def_id];
1556+
debug!(?coroutine_stalled_predicates);
15571557

15581558
let infcx = tcx
15591559
.infer_ctxt()
@@ -1566,7 +1566,7 @@ pub(super) fn check_coroutine_obligations(
15661566
.build();
15671567

15681568
let mut fulfillment_cx = <dyn TraitEngine<'_>>::new(&infcx);
1569-
for (predicate, cause) in coroutine_interior_predicates {
1569+
for (predicate, cause) in coroutine_stalled_predicates {
15701570
let obligation = Obligation::new(tcx, cause.clone(), param_env, *predicate);
15711571
fulfillment_cx.register_predicate_obligation(&infcx, obligation);
15721572
}

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
579579
debug!(?obligations);
580580
self.typeck_results
581581
.borrow_mut()
582-
.coroutine_interior_predicates
582+
.coroutine_stalled_predicates
583583
.insert(expr_def_id, obligations);
584584
}
585585
}

compiler/rustc_hir_typeck/src/writeback.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -552,11 +552,11 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
552552
assert_eq!(fcx_typeck_results.hir_owner, self.typeck_results.hir_owner);
553553
self.tcx().with_stable_hashing_context(move |ref hcx| {
554554
for (&expr_def_id, predicates) in
555-
fcx_typeck_results.coroutine_interior_predicates.to_sorted(hcx, false).into_iter()
555+
fcx_typeck_results.coroutine_stalled_predicates.to_sorted(hcx, false).into_iter()
556556
{
557557
let predicates =
558558
self.resolve(predicates.clone(), &self.fcx.tcx.def_span(expr_def_id));
559-
self.typeck_results.coroutine_interior_predicates.insert(expr_def_id, predicates);
559+
self.typeck_results.coroutine_stalled_predicates.insert(expr_def_id, predicates);
560560
}
561561
})
562562
}

compiler/rustc_middle/src/ty/typeck_results.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ pub struct TypeckResults<'tcx> {
201201

202202
/// Stores the predicates that apply on coroutine witness types.
203203
/// formatting modified file tests/ui/coroutine/retain-resume-ref.rs
204-
pub coroutine_interior_predicates:
204+
pub coroutine_stalled_predicates:
205205
LocalDefIdMap<Vec<(ty::Predicate<'tcx>, ObligationCause<'tcx>)>>,
206206

207207
/// We sometimes treat byte string literals (which are of type `&[u8; N]`)
@@ -243,7 +243,7 @@ impl<'tcx> TypeckResults<'tcx> {
243243
closure_min_captures: Default::default(),
244244
closure_fake_reads: Default::default(),
245245
rvalue_scopes: Default::default(),
246-
coroutine_interior_predicates: Default::default(),
246+
coroutine_stalled_predicates: Default::default(),
247247
treat_byte_string_as_slice: Default::default(),
248248
closure_size_eval: Default::default(),
249249
offset_of_data: Default::default(),

0 commit comments

Comments
 (0)