From 23dbcd581ce687c68a61909bd96b49c5a1e4b1a2 Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Tue, 18 Jun 2024 11:10:18 +0000 Subject: [PATCH 1/2] Remove redundant argument from `subdiagnostic` method --- src/diagnostics.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diagnostics.rs b/src/diagnostics.rs index 14e29aa423..12fb76f397 100644 --- a/src/diagnostics.rs +++ b/src/diagnostics.rs @@ -566,7 +566,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); From d865ab3904f4be5ced807e8f8f8d62767ddc0b55 Mon Sep 17 00:00:00 2001 From: The Miri Cronjob Bot Date: Wed, 19 Jun 2024 04:54:41 +0000 Subject: [PATCH 2/2] Preparing for merge from rustc --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 356d4767c7..a2da736656 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c2932aaf9d20acbc9259c762f1a06f8767c6f13f +a1ca449981e3b8442e358026437b7bedb9a1458e