From e4403ae9ff9ca9912fe80a5401c57c48fb979e5f Mon Sep 17 00:00:00 2001 From: Giacomo Stevanato Date: Sat, 20 Aug 2022 18:30:49 +0200 Subject: Move existing diagnostic struct to a new errors module --- compiler/rustc_interface/src/errors.rs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 compiler/rustc_interface/src/errors.rs (limited to 'compiler/rustc_interface/src/errors.rs') diff --git a/compiler/rustc_interface/src/errors.rs b/compiler/rustc_interface/src/errors.rs new file mode 100644 index 00000000000..62456d76d71 --- /dev/null +++ b/compiler/rustc_interface/src/errors.rs @@ -0,0 +1,19 @@ +use rustc_macros::SessionDiagnostic; +use rustc_span::{Span, Symbol}; + +#[derive(SessionDiagnostic)] +#[diag(interface::ferris_identifier)] +pub struct FerrisIdentifier { + #[primary_span] + pub spans: Vec, + #[suggestion(code = "ferris", applicability = "maybe-incorrect")] + pub first_span: Span, +} + +#[derive(SessionDiagnostic)] +#[diag(interface::emoji_identifier)] +pub struct EmojiIdentifier { + #[primary_span] + pub spans: Vec, + pub ident: Symbol, +} -- cgit 1.4.1-3-g733a5 From b411adec2aff3d57928e42017aa267fbed6e05f5 Mon Sep 17 00:00:00 2001 From: Giacomo Stevanato Date: Sat, 20 Aug 2022 18:33:02 +0200 Subject: Move rustc_interface diagnostics to struct SessionDiagnostic derives --- .../locales/en-US/interface.ftl | 37 ++++++++++++ compiler/rustc_interface/src/errors.rs | 68 ++++++++++++++++++++++ compiler/rustc_interface/src/passes.rs | 54 ++++++++--------- compiler/rustc_interface/src/queries.rs | 18 +++--- 4 files changed, 137 insertions(+), 40 deletions(-) (limited to 'compiler/rustc_interface/src/errors.rs') diff --git a/compiler/rustc_error_messages/locales/en-US/interface.ftl b/compiler/rustc_error_messages/locales/en-US/interface.ftl index 2c05abd8c09..47419537311 100644 --- a/compiler/rustc_error_messages/locales/en-US/interface.ftl +++ b/compiler/rustc_error_messages/locales/en-US/interface.ftl @@ -4,3 +4,40 @@ interface_ferris_identifier = interface_emoji_identifier = identifiers cannot contain emoji: `{$ident}` + +mixed_bin_crate = + cannot mix `bin` crate type with others + +mixed_proc_macro_crate = + cannot mix `proc-macro` crate type with others + +proc_macro_doc_without_arg = + Trying to document proc macro crate without passing '--crate-type proc-macro to rustdoc + .warn = The generated documentation may be incorrect + +error_writing_dependencies = + error writing dependencies to `{$path}`: {$error} + +input_file_would_be_overwritten = + the input file "{$path}" would be overwritten by the generated executable + +generated_file_conflicts_with_directory = + the generated executable for the input file "{$input_path}" conflicts with the existing directory "{$dir_path}" + +temps_dir_error = + failed to find or create the directory specified by `--temps-dir` + +out_dir_error = + failed to find or create the directory specified by `--out-dir` + +cant_emit_mir = + could not emit MIR: {$error} + +rustc_error_fatal = + fatal error triggered by #[rustc_error] + +rustc_error_unexpected_annotation = + unexpected annotation used with `#[rustc_error(...)]! + +failed_writing_file = + failed to write file {$path}: {$error}" diff --git a/compiler/rustc_interface/src/errors.rs b/compiler/rustc_interface/src/errors.rs index 62456d76d71..a72134e31f1 100644 --- a/compiler/rustc_interface/src/errors.rs +++ b/compiler/rustc_interface/src/errors.rs @@ -1,3 +1,4 @@ +use rustc_errors::DiagnosticArgFromDisplay; use rustc_macros::SessionDiagnostic; use rustc_span::{Span, Symbol}; @@ -17,3 +18,70 @@ pub struct EmojiIdentifier { pub spans: Vec, pub ident: Symbol, } + +#[derive(SessionDiagnostic)] +#[diag(interface::mixed_bin_crate)] +pub struct MixedBinCrate; + +#[derive(SessionDiagnostic)] +#[diag(interface::mixed_proc_macro_crate)] +pub struct MixedProcMacroCrate; + +#[derive(SessionDiagnostic)] +#[diag(interface::proc_macro_doc_without_arg)] +pub struct ProcMacroDocWithoutArg; + +#[derive(SessionDiagnostic)] +#[diag(interface::error_writing_dependencies)] +pub struct ErrorWritingDependencies<'a> { + pub path: DiagnosticArgFromDisplay<'a>, + pub error: DiagnosticArgFromDisplay<'a>, +} + +#[derive(SessionDiagnostic)] +#[diag(interface::input_file_would_be_overwritten)] +pub struct InputFileWouldBeOverWritten<'a> { + pub path: DiagnosticArgFromDisplay<'a>, +} + +#[derive(SessionDiagnostic)] +#[diag(interface::generated_file_conflicts_with_directory)] +pub struct GeneratedFileConflictsWithDirectory<'a> { + pub input_path: DiagnosticArgFromDisplay<'a>, + pub dir_path: DiagnosticArgFromDisplay<'a>, +} + +#[derive(SessionDiagnostic)] +#[diag(interface::temps_dir_error)] +pub struct TempsDirError; + +#[derive(SessionDiagnostic)] +#[diag(interface::out_dir_error)] +pub struct OutDirError; + +#[derive(SessionDiagnostic)] +#[diag(interface::cant_emit_mir)] +pub struct CantEmitMIR<'a> { + pub error: DiagnosticArgFromDisplay<'a>, +} + +#[derive(SessionDiagnostic)] +#[diag(interface::rustc_error_fatal)] +pub struct RustcErrorFatal { + #[primary_span] + pub span: Span, +} + +#[derive(SessionDiagnostic)] +#[diag(interface::rustc_error_unexpected_annotation)] +pub struct RustcErrorUnexpectedAnnotation { + #[primary_span] + pub span: Span, +} + +#[derive(SessionDiagnostic)] +#[diag(interface::failed_writing_file)] +pub struct FailedWritingFile<'a> { + pub path: DiagnosticArgFromDisplay<'a>, + pub error: DiagnosticArgFromDisplay<'a>, +} diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs index 759f9e0f0c9..b58fd7b338c 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -1,4 +1,8 @@ -use crate::errors::{EmojiIdentifier, FerrisIdentifier}; +use crate::errors::{ + CantEmitMIR, EmojiIdentifier, ErrorWritingDependencies, FerrisIdentifier, + GeneratedFileConflictsWithDirectory, InputFileWouldBeOverWritten, MixedBinCrate, + MixedProcMacroCrate, OutDirError, ProcMacroDocWithoutArg, TempsDirError, +}; use crate::interface::{Compiler, Result}; use crate::proc_macro_decls; use crate::util; @@ -375,10 +379,10 @@ pub fn configure_and_expand( if crate_types.len() > 1 { if is_executable_crate { - sess.err("cannot mix `bin` crate type with others"); + sess.emit_err(MixedBinCrate); } if is_proc_macro_crate { - sess.err("cannot mix `proc-macro` crate type with others"); + sess.emit_err(MixedProcMacroCrate); } } @@ -389,13 +393,7 @@ pub fn configure_and_expand( // However, we do emit a warning, to let such users know that they should // start passing '--crate-type proc-macro' if has_proc_macro_decls && sess.opts.actually_rustdoc && !is_proc_macro_crate { - let mut msg = sess.diagnostic().struct_warn( - "Trying to document proc macro crate \ - without passing '--crate-type proc-macro to rustdoc", - ); - - msg.warn("The generated documentation may be incorrect"); - msg.emit(); + sess.emit_warning(ProcMacroDocWithoutArg); } else { krate = sess.time("maybe_create_a_macro_crate", || { let is_test_crate = sess.opts.test; @@ -649,11 +647,12 @@ fn write_out_deps( .emit_artifact_notification(&deps_filename, "dep-info"); } } - Err(e) => sess.fatal(&format!( - "error writing dependencies to `{}`: {}", - deps_filename.display(), - e - )), + Err(e) => { + sess.emit_fatal(ErrorWritingDependencies { + path: (&deps_filename.display()).into(), + error: (&e).into(), + }); + } } } @@ -683,20 +682,15 @@ pub fn prepare_outputs( if let Some(ref input_path) = compiler.input_path { if sess.opts.will_create_output_file() { if output_contains_path(&output_paths, input_path) { - let reported = sess.err(&format!( - "the input file \"{}\" would be overwritten by the generated \ - executable", - input_path.display() - )); + let reported = sess + .emit_err(InputFileWouldBeOverWritten { path: (&input_path.display()).into() }); return Err(reported); } if let Some(dir_path) = output_conflicts_with_dir(&output_paths) { - let reported = sess.err(&format!( - "the generated executable for the input file \"{}\" conflicts with the \ - existing directory \"{}\"", - input_path.display(), - dir_path.display() - )); + let reported = sess.emit_err(GeneratedFileConflictsWithDirectory { + input_path: (&input_path.display()).into(), + dir_path: (&dir_path.display()).into(), + }); return Err(reported); } } @@ -704,8 +698,7 @@ pub fn prepare_outputs( if let Some(ref dir) = compiler.temps_dir { if fs::create_dir_all(dir).is_err() { - let reported = - sess.err("failed to find or create the directory specified by `--temps-dir`"); + let reported = sess.emit_err(TempsDirError); return Err(reported); } } @@ -718,8 +711,7 @@ pub fn prepare_outputs( if !only_dep_info { if let Some(ref dir) = compiler.output_dir { if fs::create_dir_all(dir).is_err() { - let reported = - sess.err("failed to find or create the directory specified by `--out-dir`"); + let reported = sess.emit_err(OutDirError); return Err(reported); } } @@ -1003,7 +995,7 @@ pub fn start_codegen<'tcx>( if tcx.sess.opts.output_types.contains_key(&OutputType::Mir) { if let Err(e) = rustc_mir_transform::dump_mir::emit_mir(tcx, outputs) { - tcx.sess.err(&format!("could not emit MIR: {}", e)); + tcx.sess.emit_err(CantEmitMIR { error: (&e).into() }); tcx.sess.abort_if_errors(); } } diff --git a/compiler/rustc_interface/src/queries.rs b/compiler/rustc_interface/src/queries.rs index 73402ae0842..e0e8752036e 100644 --- a/compiler/rustc_interface/src/queries.rs +++ b/compiler/rustc_interface/src/queries.rs @@ -1,3 +1,4 @@ +use crate::errors::{FailedWritingFile, RustcErrorFatal, RustcErrorUnexpectedAnnotation}; use crate::interface::{Compiler, Result}; use crate::passes::{self, BoxedResolver, QueryContext}; @@ -274,18 +275,14 @@ impl<'tcx> Queries<'tcx> { // Bare `#[rustc_error]`. None => { - tcx.sess.span_fatal( - tcx.def_span(def_id), - "fatal error triggered by #[rustc_error]", - ); + tcx.sess.emit_fatal(RustcErrorFatal { span: tcx.def_span(def_id) }); } // Some other attribute. Some(_) => { - tcx.sess.span_warn( - tcx.def_span(def_id), - "unexpected annotation used with `#[rustc_error(...)]!", - ); + tcx.sess.emit_warning(RustcErrorUnexpectedAnnotation { + span: tcx.def_span(def_id), + }); } } } @@ -361,7 +358,10 @@ impl Linker { let encoded = CodegenResults::serialize_rlink(&codegen_results); let rlink_file = self.prepare_outputs.with_extension(config::RLINK_EXT); std::fs::write(&rlink_file, encoded).map_err(|err| { - sess.fatal(&format!("failed to write file {}: {}", rlink_file.display(), err)); + sess.emit_fatal(FailedWritingFile { + path: (&rlink_file.display()).into(), + error: (&err).into(), + }) })?; return Ok(()); } -- cgit 1.4.1-3-g733a5 From 645de5b825987473f02b6ac62cfe915602be4c28 Mon Sep 17 00:00:00 2001 From: Giacomo Stevanato Date: Mon, 22 Aug 2022 15:58:26 +0200 Subject: Remove use of DiagnosticArgFromDisplay --- compiler/rustc_interface/src/errors.rs | 22 ++++++++++++---------- compiler/rustc_interface/src/passes.rs | 22 ++++++++-------------- compiler/rustc_interface/src/queries.rs | 8 ++------ 3 files changed, 22 insertions(+), 30 deletions(-) (limited to 'compiler/rustc_interface/src/errors.rs') diff --git a/compiler/rustc_interface/src/errors.rs b/compiler/rustc_interface/src/errors.rs index a72134e31f1..6a497aed4ab 100644 --- a/compiler/rustc_interface/src/errors.rs +++ b/compiler/rustc_interface/src/errors.rs @@ -1,7 +1,9 @@ -use rustc_errors::DiagnosticArgFromDisplay; use rustc_macros::SessionDiagnostic; use rustc_span::{Span, Symbol}; +use std::io; +use std::path::Path; + #[derive(SessionDiagnostic)] #[diag(interface::ferris_identifier)] pub struct FerrisIdentifier { @@ -34,21 +36,21 @@ pub struct ProcMacroDocWithoutArg; #[derive(SessionDiagnostic)] #[diag(interface::error_writing_dependencies)] pub struct ErrorWritingDependencies<'a> { - pub path: DiagnosticArgFromDisplay<'a>, - pub error: DiagnosticArgFromDisplay<'a>, + pub path: &'a Path, + pub error: io::Error, } #[derive(SessionDiagnostic)] #[diag(interface::input_file_would_be_overwritten)] pub struct InputFileWouldBeOverWritten<'a> { - pub path: DiagnosticArgFromDisplay<'a>, + pub path: &'a Path, } #[derive(SessionDiagnostic)] #[diag(interface::generated_file_conflicts_with_directory)] pub struct GeneratedFileConflictsWithDirectory<'a> { - pub input_path: DiagnosticArgFromDisplay<'a>, - pub dir_path: DiagnosticArgFromDisplay<'a>, + pub input_path: &'a Path, + pub dir_path: &'a Path, } #[derive(SessionDiagnostic)] @@ -61,8 +63,8 @@ pub struct OutDirError; #[derive(SessionDiagnostic)] #[diag(interface::cant_emit_mir)] -pub struct CantEmitMIR<'a> { - pub error: DiagnosticArgFromDisplay<'a>, +pub struct CantEmitMIR { + pub error: io::Error, } #[derive(SessionDiagnostic)] @@ -82,6 +84,6 @@ pub struct RustcErrorUnexpectedAnnotation { #[derive(SessionDiagnostic)] #[diag(interface::failed_writing_file)] pub struct FailedWritingFile<'a> { - pub path: DiagnosticArgFromDisplay<'a>, - pub error: DiagnosticArgFromDisplay<'a>, + pub path: &'a Path, + pub error: io::Error, } diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs index b58fd7b338c..269d4c3795a 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -647,11 +647,8 @@ fn write_out_deps( .emit_artifact_notification(&deps_filename, "dep-info"); } } - Err(e) => { - sess.emit_fatal(ErrorWritingDependencies { - path: (&deps_filename.display()).into(), - error: (&e).into(), - }); + Err(error) => { + sess.emit_fatal(ErrorWritingDependencies { path: &deps_filename, error }); } } } @@ -682,15 +679,12 @@ pub fn prepare_outputs( if let Some(ref input_path) = compiler.input_path { if sess.opts.will_create_output_file() { if output_contains_path(&output_paths, input_path) { - let reported = sess - .emit_err(InputFileWouldBeOverWritten { path: (&input_path.display()).into() }); + let reported = sess.emit_err(InputFileWouldBeOverWritten { path: input_path }); return Err(reported); } - if let Some(dir_path) = output_conflicts_with_dir(&output_paths) { - let reported = sess.emit_err(GeneratedFileConflictsWithDirectory { - input_path: (&input_path.display()).into(), - dir_path: (&dir_path.display()).into(), - }); + if let Some(ref dir_path) = output_conflicts_with_dir(&output_paths) { + let reported = + sess.emit_err(GeneratedFileConflictsWithDirectory { input_path, dir_path }); return Err(reported); } } @@ -994,8 +988,8 @@ pub fn start_codegen<'tcx>( info!("Post-codegen\n{:?}", tcx.debug_stats()); if tcx.sess.opts.output_types.contains_key(&OutputType::Mir) { - if let Err(e) = rustc_mir_transform::dump_mir::emit_mir(tcx, outputs) { - tcx.sess.emit_err(CantEmitMIR { error: (&e).into() }); + if let Err(error) = rustc_mir_transform::dump_mir::emit_mir(tcx, outputs) { + tcx.sess.emit_err(CantEmitMIR { error }); tcx.sess.abort_if_errors(); } } diff --git a/compiler/rustc_interface/src/queries.rs b/compiler/rustc_interface/src/queries.rs index e0e8752036e..65fa8d7495a 100644 --- a/compiler/rustc_interface/src/queries.rs +++ b/compiler/rustc_interface/src/queries.rs @@ -357,12 +357,8 @@ impl Linker { if sess.opts.unstable_opts.no_link { let encoded = CodegenResults::serialize_rlink(&codegen_results); let rlink_file = self.prepare_outputs.with_extension(config::RLINK_EXT); - std::fs::write(&rlink_file, encoded).map_err(|err| { - sess.emit_fatal(FailedWritingFile { - path: (&rlink_file.display()).into(), - error: (&err).into(), - }) - })?; + std::fs::write(&rlink_file, encoded) + .map_err(|error| sess.emit_fatal(FailedWritingFile { path: &rlink_file, error }))?; return Ok(()); } -- cgit 1.4.1-3-g733a5