Skip to content

Migrate symbol_mangling module to new diagnostics structs #100831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
UPDATE - accept String instead of unused 'str
  • Loading branch information
JhonnyBillM committed Aug 30, 2022
commit bd83bbc93adce97e34c1c4d5d8d74f7b19068326
12 changes: 6 additions & 6 deletions compiler/rustc_symbol_mangling/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ use rustc_span::Span;

#[derive(SessionDiagnostic)]
#[error(symbol_mangling::invalid_symbol_name)]
pub struct InvalidSymbolName<'a> {
pub struct InvalidSymbolName {
#[primary_span]
pub span: Span,
pub mangled_formatted: &'a str,
pub mangled_formatted: String,
}

#[derive(SessionDiagnostic)]
#[error(symbol_mangling::invalid_trait_item)]
pub struct InvalidTraitItem<'a> {
pub struct InvalidTraitItem {
#[primary_span]
pub span: Span,
pub demangling_formatted: &'a str,
pub demangling_formatted: String,
}

#[derive(SessionDiagnostic)]
#[error(symbol_mangling::alt_invalid_trait_item)]
pub struct AltInvalidTraitItem<'a> {
pub struct AltInvalidTraitItem {
#[primary_span]
pub span: Span,
pub alt_demangling_formatted: &'a str,
pub alt_demangling_formatted: String,
}
6 changes: 3 additions & 3 deletions compiler/rustc_symbol_mangling/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ impl SymbolNamesTest<'_> {
let mangled = tcx.symbol_name(instance);
tcx.sess.emit_err(InvalidSymbolName {
span: attr.span,
mangled_formatted: &format!("{mangled}"),
mangled_formatted: format!("{mangled}"),
});
if let Ok(demangling) = rustc_demangle::try_demangle(mangled.name) {
tcx.sess.emit_err(InvalidTraitItem {
span: attr.span,
demangling_formatted: &format!("{demangling}"),
demangling_formatted: format!("{demangling}"),
});
tcx.sess.emit_err(AltInvalidTraitItem {
span: attr.span,
alt_demangling_formatted: &format!("{:#}", demangling),
alt_demangling_formatted: format!("{:#}", demangling),
});
}
}
Expand Down