Auto merge of #3685 - rust-lang:rustup-2024-06-19, r=RalfJung

Automatic Rustup
rust-lang · Jun 19, 2024 · 314f7f2 · 314f7f2
2 parents 606e143 + 92a823a
commit 314f7f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-c2932aaf9d20acbc9259c762f1a06f8767c6f13f
+a1ca449981e3b8442e358026437b7bedb9a1458e
diff --git a/src/diagnostics.rs b/src/diagnostics.rs
@@ -569,7 +569,7 @@ pub fn report_msg<'tcx>(
  let is_local = machine.is_local(frame_info);
  // No span for non-local frames and the first frame (which is the error site).
  if is_local && idx > 0 {
- err.subdiagnostic(err.dcx, frame_info.as_note(machine.tcx));
+ err.subdiagnostic(frame_info.as_note(machine.tcx));
  } else {
  let sm = sess.source_map();
  let span = sm.span_to_embeddable_string(frame_info.span);