Auto merge of #3335 - rust-lang:rustup-2024-02-29, r=saethlin

Automatic Rustup
rust-lang · Feb 29, 2024 · c772b23 · c772b23
2 parents 3b490bf + 2e8efd0
commit c772b23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-71ffdf7ff7ac6df5f9f64de7e780b8345797e8a0
+d3d145ea1cae47ad392173f890577788117da3d9
diff --git a/src/diagnostics.rs b/src/diagnostics.rs
@@ -1,7 +1,7 @@
 use std::fmt::{self, Write};
 use std::num::NonZero;
 
-use rustc_errors::{DiagnosticBuilder, DiagnosticMessage, Level};
+use rustc_errors::{Diag, DiagnosticMessage, Level};
 use rustc_span::{SpanData, Symbol, DUMMY_SP};
 use rustc_target::abi::{Align, Size};
 
@@ -100,7 +100,7 @@ impl MachineStopType for TerminationInfo {
     }
     fn add_args(
         self: Box<Self>,
-        _: &mut dyn FnMut(std::borrow::Cow<'static, str>, rustc_errors::DiagnosticArgValue),
+        _: &mut dyn FnMut(std::borrow::Cow<'static, str>, rustc_errors::DiagArgValue),
     ) {
     }
 }
@@ -459,7 +459,7 @@ pub fn report_msg<'tcx>(
         DiagLevel::Warning => Level::Warning,
         DiagLevel::Note => Level::Note,
     };
-    let mut err = DiagnosticBuilder::<()>::new(sess.dcx(), level, title);
+    let mut err = Diag::<()>::new(sess.dcx(), level, title);
     err.span(span);
 
     // Show main message.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		71ffdf7ff7ac6df5f9f64de7e780b8345797e8a0
		d3d145ea1cae47ad392173f890577788117da3d9