bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove IntoDiagnosticArg impl for Option

Browse source
This commit is contained in:
Ellis Hoag 2022-08-29 20:22:03 -07:00
parent 1ce482adda
commit fb488ad366
3 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_gcc/src/archive.rs
View file

@ -183,7 +183,7 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
std::process::Command::new("ranlib").arg(output).status().expect("Couldn't run ranlib"); std::process::Command::new("ranlib").arg(output).status().expect("Couldn't run ranlib");
if !status.success() { if !status.success() {
self.config.sess.emit_fatal(RanlibFailure { exit_code: status.code() }); self.config.sess.emit_fatal(RanlibFailure { exit_code: format!("{:?}", status.code()) });
} }
any_members any_members

2
compiler/rustc_codegen_gcc/src/errors.rs
View file

@ -4,7 +4,7 @@ use rustc_span::Span;
#[derive(SessionDiagnostic)] #[derive(SessionDiagnostic)]
#[diag(codegen_gcc::ranlib_failure)] #[diag(codegen_gcc::ranlib_failure)]
pub(crate) struct RanlibFailure { pub(crate) struct RanlibFailure {
pub exit_code: Option<i32> pub exit_code: String,
} }
#[derive(SessionDiagnostic)] #[derive(SessionDiagnostic)]

9
compiler/rustc_errors/src/diagnostic.rs
View file

@ -114,15 +114,6 @@ impl IntoDiagnosticArg for char {
} }
} }
impl<T: IntoDiagnosticArg> IntoDiagnosticArg for Option<T> {
fn into_diagnostic_arg(self) -> DiagnosticArgValue<'static> {
match self {
Some(t) => t.into_diagnostic_arg(),
None => DiagnosticArgValue::Str(Cow::Borrowed("None")),
}
}
}
impl IntoDiagnosticArg for Symbol { impl IntoDiagnosticArg for Symbol {
fn into_diagnostic_arg(self) -> DiagnosticArgValue<'static> { fn into_diagnostic_arg(self) -> DiagnosticArgValue<'static> {
self.to_ident_string().into_diagnostic_arg() self.to_ident_string().into_diagnostic_arg()