Skip to content

Commit a84bb95

Browse files
committedFeb 13, 2024
Auto merge of #121036 - matthiaskrgr:rollup-ul05q8e, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #114877 (unstable-book: add quick-edit link) - #120548 (rustdoc: Fix handling of doc_auto_cfg feature for cfg attributes on glob reexport) - #120549 (modify alias-relate to also normalize ambiguous opaques) - #120959 (Remove good path delayed bugs) - #120978 (match lowering: simplify block creation) - #121019 (coverage: Simplify some parts of the coverage span refiner) - #121021 (Extend intra-doc link chapter in the rustdoc book) - #121031 (RustWrapper: adapt for coverage mapping API changes) Failed merges: - #121014 (Remove `force_print_diagnostic`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents eaff1af + 8dffa39 commit a84bb95

File tree

107 files changed

+1220
-1134
lines changed

Some content is hidden

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

107 files changed

+1220
-1134
lines changed
 

‎compiler/rustc_const_eval/src/interpret/eval_context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ impl<'tcx> fmt::Display for FrameInfo<'tcx> {
288288
if tcx.def_key(self.instance.def_id()).disambiguated_data.data == DefPathData::Closure {
289289
write!(f, "inside closure")
290290
} else {
291-
// Note: this triggers a `good_path_delayed_bug` state, which means that if we ever
291+
// Note: this triggers a `must_produce_diag` state, which means that if we ever
292292
// get here we must emit a diagnostic. We should never display a `FrameInfo` unless
293293
// we actually want to emit a warning or error to the user.
294294
write!(f, "inside `{}`", self.instance)
@@ -304,7 +304,7 @@ impl<'tcx> FrameInfo<'tcx> {
304304
errors::FrameNote { where_: "closure", span, instance: String::new(), times: 0 }
305305
} else {
306306
let instance = format!("{}", self.instance);
307-
// Note: this triggers a `good_path_delayed_bug` state, which means that if we ever get
307+
// Note: this triggers a `must_produce_diag` state, which means that if we ever get
308308
// here we must emit a diagnostic. We should never display a `FrameInfo` unless we
309309
// actually want to emit a warning or error to the user.
310310
errors::FrameNote { where_: "instance", span, instance, times: 0 }

‎compiler/rustc_error_messages/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ impl From<Cow<'static, str>> for DiagnosticMessage {
376376
}
377377
}
378378

379-
/// A workaround for good_path_delayed_bug ICEs when formatting types in disabled lints.
379+
/// A workaround for must_produce_diag ICEs when formatting types in disabled lints.
380380
///
381381
/// Delays formatting until `.into(): DiagnosticMessage` is used.
382382
pub struct DelayDm<F>(pub F);

0 commit comments

Comments
 (0)