diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-03-05 20:57:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-05 20:57:21 +0100 |
| commit | 1c2f641e15a91f38cb5b67381de474bdcb1d5e0c (patch) | |
| tree | 74ed608de814d2b4bbf05baa1fad08d3b3d5b010 /compiler/rustc_mir_transform/src | |
| parent | b8762321a2978c8fd6d3e451132afbd4703df7f0 (diff) | |
| parent | fba5d3dd03a0dcb0ed544950bd00f50f85f493ef (diff) | |
| download | rust-1c2f641e15a91f38cb5b67381de474bdcb1d5e0c.tar.gz rust-1c2f641e15a91f38cb5b67381de474bdcb1d5e0c.zip | |
Rollup merge of #108764 - cjgillot:dpm-adapt, r=compiler-errors
Tweaks to -Zdrop-tracking-mir Split from https://github.com/rust-lang/rust/pull/107421 3 commits: 1 diagnostic improvement and 2 ICEs.
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/generator.rs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/compiler/rustc_mir_transform/src/generator.rs b/compiler/rustc_mir_transform/src/generator.rs index 2e97312ee50..746326f9bde 100644 --- a/compiler/rustc_mir_transform/src/generator.rs +++ b/compiler/rustc_mir_transform/src/generator.rs @@ -1872,12 +1872,14 @@ fn check_must_not_suspend_def( data: SuspendCheckData<'_>, ) -> bool { if let Some(attr) = tcx.get_attr(def_id, sym::must_not_suspend) { - let msg = format!( - "{}`{}`{} held across a suspend point, but should not be", - data.descr_pre, - tcx.def_path_str(def_id), - data.descr_post, - ); + let msg = rustc_errors::DelayDm(|| { + format!( + "{}`{}`{} held across a suspend point, but should not be", + data.descr_pre, + tcx.def_path_str(def_id), + data.descr_post, + ) + }); tcx.struct_span_lint_hir( rustc_session::lint::builtin::MUST_NOT_SUSPEND, hir_id, |