Rollup merge of #108436 - tshepang:translatable-proc-macro-panicked, r=estebank

make "proc macro panicked" translatable
This commit is contained in:
Matthias Krüger 2023-02-26 00:46:27 +01:00 committed by GitHub
commit 9631f4b5c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 5 deletions

View File

@ -129,3 +129,7 @@ expand_module_multiple_candidates =
.help = delete or rename one of them to remove the ambiguity
expand_trace_macro = trace_macro
expand_proc_macro_panicked =
proc macro panicked
.help = message: {$message}

View File

@ -375,3 +375,18 @@ pub struct TraceMacro {
#[primary_span]
pub span: Span,
}
#[derive(Diagnostic)]
#[diag(expand_proc_macro_panicked)]
pub(crate) struct ProcMacroPanicked {
#[primary_span]
pub span: Span,
#[subdiagnostic]
pub message: Option<ProcMacroPanickedHelp>,
}
#[derive(Subdiagnostic)]
#[help(expand_help)]
pub(crate) struct ProcMacroPanickedHelp {
pub message: String,
}

View File

@ -1,4 +1,5 @@
use crate::base::{self, *};
use crate::errors;
use crate::proc_macro_server;
use rustc_ast as ast;
@ -60,11 +61,12 @@ fn expand<'cx>(
let strategy = exec_strategy(ecx);
let server = proc_macro_server::Rustc::new(ecx);
self.client.run(&strategy, server, input, proc_macro_backtrace).map_err(|e| {
let mut err = ecx.struct_span_err(span, "proc macro panicked");
if let Some(s) = e.as_str() {
err.help(&format!("message: {}", s));
}
err.emit()
ecx.sess.emit_err(errors::ProcMacroPanicked {
span,
message: e
.as_str()
.map(|message| errors::ProcMacroPanickedHelp { message: message.into() }),
})
})
}
}