Skip to content

Commit ec85ac5

Browse files
Rollup merge of rust-lang#108436 - tshepang:translatable-proc-macro-panicked, r=estebank
make "proc macro panicked" translatable
2 parents eb2da60 + dca52ac commit ec85ac5

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

compiler/rustc_expand/locales/en-US.ftl

+4
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,7 @@ expand_module_multiple_candidates =
129129
.help = delete or rename one of them to remove the ambiguity
130130
131131
expand_trace_macro = trace_macro
132+
133+
expand_proc_macro_panicked =
134+
proc macro panicked
135+
.help = message: {$message}

compiler/rustc_expand/src/errors.rs

+15
Original file line numberDiff line numberDiff line change
@@ -375,3 +375,18 @@ pub struct TraceMacro {
375375
#[primary_span]
376376
pub span: Span,
377377
}
378+
379+
#[derive(Diagnostic)]
380+
#[diag(expand_proc_macro_panicked)]
381+
pub(crate) struct ProcMacroPanicked {
382+
#[primary_span]
383+
pub span: Span,
384+
#[subdiagnostic]
385+
pub message: Option<ProcMacroPanickedHelp>,
386+
}
387+
388+
#[derive(Subdiagnostic)]
389+
#[help(expand_help)]
390+
pub(crate) struct ProcMacroPanickedHelp {
391+
pub message: String,
392+
}

compiler/rustc_expand/src/proc_macro.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use crate::base::{self, *};
2+
use crate::errors;
23
use crate::proc_macro_server;
34

45
use rustc_ast as ast;
@@ -60,11 +61,12 @@ impl base::BangProcMacro for BangProcMacro {
6061
let strategy = exec_strategy(ecx);
6162
let server = proc_macro_server::Rustc::new(ecx);
6263
self.client.run(&strategy, server, input, proc_macro_backtrace).map_err(|e| {
63-
let mut err = ecx.struct_span_err(span, "proc macro panicked");
64-
if let Some(s) = e.as_str() {
65-
err.help(&format!("message: {}", s));
66-
}
67-
err.emit()
64+
ecx.sess.emit_err(errors::ProcMacroPanicked {
65+
span,
66+
message: e
67+
.as_str()
68+
.map(|message| errors::ProcMacroPanickedHelp { message: message.into() }),
69+
})
6870
})
6971
}
7072
}

0 commit comments

Comments
 (0)