New upstream version 1.66.0+dfsg1

[rustc.git] / compiler / rustc_interface / src / errors.rs

diff --git a/compiler/rustc_interface/src/errors.rs b/compiler/rustc_interface/src/errors.rs
index 6a497aed4aba75900410fe8b166cd56b92293a21..f5135c78dc8313c32dfea0a77e564ece5f972c1f 100644 (file)
--- a/compiler/rustc_interface/src/errors.rs
+++ b/compiler/rustc_interface/src/errors.rs
@@ -1,11 +1,11 @@
-use rustc_macros::SessionDiagnostic;
+use rustc_macros::Diagnostic;
 use rustc_span::{Span, Symbol};
 
 use std::io;
 use std::path::Path;
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::ferris_identifier)]
+#[derive(Diagnostic)]
+#[diag(interface_ferris_identifier)]
 pub struct FerrisIdentifier {
     #[primary_span]
     pub spans: Vec<Span>,
@@ -13,76 +13,76 @@ pub struct FerrisIdentifier {
     pub first_span: Span,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::emoji_identifier)]
+#[derive(Diagnostic)]
+#[diag(interface_emoji_identifier)]
 pub struct EmojiIdentifier {
     #[primary_span]
     pub spans: Vec<Span>,
     pub ident: Symbol,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::mixed_bin_crate)]
+#[derive(Diagnostic)]
+#[diag(interface_mixed_bin_crate)]
 pub struct MixedBinCrate;
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::mixed_proc_macro_crate)]
+#[derive(Diagnostic)]
+#[diag(interface_mixed_proc_macro_crate)]
 pub struct MixedProcMacroCrate;
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::proc_macro_doc_without_arg)]
+#[derive(Diagnostic)]
+#[diag(interface_proc_macro_doc_without_arg)]
 pub struct ProcMacroDocWithoutArg;
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::error_writing_dependencies)]
+#[derive(Diagnostic)]
+#[diag(interface_error_writing_dependencies)]
 pub struct ErrorWritingDependencies<'a> {
     pub path: &'a Path,
     pub error: io::Error,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::input_file_would_be_overwritten)]
+#[derive(Diagnostic)]
+#[diag(interface_input_file_would_be_overwritten)]
 pub struct InputFileWouldBeOverWritten<'a> {
     pub path: &'a Path,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::generated_file_conflicts_with_directory)]
+#[derive(Diagnostic)]
+#[diag(interface_generated_file_conflicts_with_directory)]
 pub struct GeneratedFileConflictsWithDirectory<'a> {
     pub input_path: &'a Path,
     pub dir_path: &'a Path,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::temps_dir_error)]
+#[derive(Diagnostic)]
+#[diag(interface_temps_dir_error)]
 pub struct TempsDirError;
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::out_dir_error)]
+#[derive(Diagnostic)]
+#[diag(interface_out_dir_error)]
 pub struct OutDirError;
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::cant_emit_mir)]
+#[derive(Diagnostic)]
+#[diag(interface_cant_emit_mir)]
 pub struct CantEmitMIR {
     pub error: io::Error,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::rustc_error_fatal)]
+#[derive(Diagnostic)]
+#[diag(interface_rustc_error_fatal)]
 pub struct RustcErrorFatal {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::rustc_error_unexpected_annotation)]
+#[derive(Diagnostic)]
+#[diag(interface_rustc_error_unexpected_annotation)]
 pub struct RustcErrorUnexpectedAnnotation {
     #[primary_span]
     pub span: Span,
 }
 
-#[derive(SessionDiagnostic)]
-#[diag(interface::failed_writing_file)]
+#[derive(Diagnostic)]
+#[diag(interface_failed_writing_file)]
 pub struct FailedWritingFile<'a> {
     pub path: &'a Path,
     pub error: io::Error,