diff options
| author | Eric Holk <ericholk@microsoft.com> | 2022-07-29 15:13:44 -0700 |
|---|---|---|
| committer | Eric Holk <ericholk@microsoft.com> | 2022-07-29 15:59:26 -0700 |
| commit | 0da81997a2652b8a46506cf0a5e4d382ea1f3308 (patch) | |
| tree | 540e2156c18bbb825238e21de71afcd99b44caf0 | |
| parent | c42c77bc7b64cf9015c5b8e7f11f192e499509b3 (diff) | |
| download | rust-0da81997a2652b8a46506cf0a5e4d382ea1f3308.tar.gz rust-0da81997a2652b8a46506cf0a5e4d382ea1f3308.zip | |
Fix after rebasing
| -rw-r--r-- | compiler/rustc_typeck/src/check/generator_interior.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_typeck/src/check/generator_interior.rs b/compiler/rustc_typeck/src/check/generator_interior.rs index bfe0200101c..85a0d4e4499 100644 --- a/compiler/rustc_typeck/src/check/generator_interior.rs +++ b/compiler/rustc_typeck/src/check/generator_interior.rs @@ -584,7 +584,7 @@ fn check_must_not_suspend_ty<'tcx>( } // If drop tracking is enabled, we want to look through references, since the referrent // may not be considered live across the await point. - ty::Ref(_region, ty, _mutability) if fcx.sess().opts.debugging_opts.drop_tracking => { + ty::Ref(_region, ty, _mutability) if fcx.sess().opts.unstable_opts.drop_tracking => { let descr_pre = &format!("{}reference{} to ", data.descr_pre, plural_suffix); check_must_not_suspend_ty(fcx, ty, hir_id, SuspendCheckData { descr_pre, ..data }) } diff --git a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr b/src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr index 33c7ff2cb33..c49d2712853 100644 --- a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr +++ b/src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr @@ -3,7 +3,7 @@ error: reference to `Umm` held across a suspend point, but should not be | LL | let guard = &mut self.u; | ^^^^^ -LL | +LL | LL | other().await; | ------ the value is held across this suspend point | |
