Skip to content

Commit b7e7587

Browse files
committed
Auto merge of #121240 - matthiaskrgr:rollup-lfb5i9w, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #120952 (Don't use mem::zeroed in vec::IntoIter) - #121085 (errors: only eagerly translate subdiagnostics) - #121091 (use build.rustc config and skip-stage0-validation flag) - #121149 (Fix typo in VecDeque::handle_capacity_increase() doc comment.) - #121193 (Use fulfillment in next trait solver coherence) - #121209 (Make `CodegenBackend::join_codegen` infallible.) - #121210 (Fix `cfg(target_abi = "sim")` on `i386-apple-ios`) - #121228 (create stamp file for clippy) - #121231 (remove a couple of redundant clones) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 324bad4 + 86a1b5a commit b7e7587

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ pub fn report_msg<'tcx>(
505505
let is_local = machine.is_local(frame_info);
506506
// No span for non-local frames and the first frame (which is the error site).
507507
if is_local && idx > 0 {
508-
err.eager_subdiagnostic(err.dcx, frame_info.as_note(machine.tcx));
508+
err.subdiagnostic(err.dcx, frame_info.as_note(machine.tcx));
509509
} else {
510510
let sm = sess.source_map();
511511
let span = sm.span_to_embeddable_string(frame_info.span);

0 commit comments

Comments
 (0)