diff --git a/miette-derive/src/utils.rs b/miette-derive/src/utils.rs index 39d7696..2d58444 100644 --- a/miette-derive/src/utils.rs +++ b/miette-derive/src/utils.rs @@ -1,8 +1,6 @@ use proc_macro2::TokenStream; use quote::{format_ident, quote}; -use syn::{ - spanned::Spanned, -}; +use syn::spanned::Spanned; use crate::{ diagnostic::{DiagnosticConcreteArgs, DiagnosticDef}, diff --git a/src/eyreish/mod.rs b/src/eyreish/mod.rs index 2dfbf71..3f35103 100644 --- a/src/eyreish/mod.rs +++ b/src/eyreish/mod.rs @@ -172,11 +172,7 @@ pub trait ReportHandler: core::any::Any + Send + Sync { /// } /// } /// ``` - fn debug( - &self, - error: &(dyn Diagnostic), - f: &mut core::fmt::Formatter<'_>, - ) -> core::fmt::Result; + fn debug(&self, error: &dyn Diagnostic, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result; /// Override for the `Display` format fn display( diff --git a/src/handler.rs b/src/handler.rs index c993c43..5cd5a53 100644 --- a/src/handler.rs +++ b/src/handler.rs @@ -402,7 +402,7 @@ impl Default for MietteHandler { } impl ReportHandler for MietteHandler { - fn debug(&self, diagnostic: &(dyn Diagnostic), f: &mut fmt::Formatter<'_>) -> fmt::Result { + fn debug(&self, diagnostic: &dyn Diagnostic, f: &mut fmt::Formatter<'_>) -> fmt::Result { if f.alternate() { return fmt::Debug::fmt(diagnostic, f); } diff --git a/src/handlers/debug.rs b/src/handlers/debug.rs index 50450a4..629908b 100644 --- a/src/handlers/debug.rs +++ b/src/handlers/debug.rs @@ -31,7 +31,7 @@ impl DebugReportHandler { pub fn render_report( &self, f: &mut fmt::Formatter<'_>, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, ) -> fmt::Result { let mut diag = f.debug_struct("Diagnostic"); diag.field("message", &format!("{}", diagnostic)); @@ -61,7 +61,7 @@ impl DebugReportHandler { } impl ReportHandler for DebugReportHandler { - fn debug(&self, diagnostic: &(dyn Diagnostic), f: &mut fmt::Formatter<'_>) -> fmt::Result { + fn debug(&self, diagnostic: &dyn Diagnostic, f: &mut fmt::Formatter<'_>) -> fmt::Result { if f.alternate() { return fmt::Debug::fmt(diagnostic, f); } diff --git a/src/handlers/graphical.rs b/src/handlers/graphical.rs index faac695..37b6bf8 100644 --- a/src/handlers/graphical.rs +++ b/src/handlers/graphical.rs @@ -242,7 +242,7 @@ impl GraphicalReportHandler { pub fn render_report( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, ) -> fmt::Result { self.render_report_inner(f, diagnostic, diagnostic.source_code()) } @@ -250,7 +250,7 @@ impl GraphicalReportHandler { fn render_report_inner( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, parent_src: Option<&dyn SourceCode>, ) -> fmt::Result { let src = diagnostic.source_code().or(parent_src); @@ -281,7 +281,7 @@ impl GraphicalReportHandler { fn render_header( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, is_nested: bool, ) -> fmt::Result { let severity_style = match diagnostic.severity() { @@ -326,7 +326,7 @@ impl GraphicalReportHandler { fn render_causes( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, parent_src: Option<&dyn SourceCode>, ) -> fmt::Result { let src = diagnostic.source_code().or(parent_src); @@ -424,7 +424,7 @@ impl GraphicalReportHandler { Ok(()) } - fn render_footer(&self, f: &mut impl fmt::Write, diagnostic: &(dyn Diagnostic)) -> fmt::Result { + fn render_footer(&self, f: &mut impl fmt::Write, diagnostic: &dyn Diagnostic) -> fmt::Result { if let Some(help) = diagnostic.help() { let width = self.termwidth.saturating_sub(2); let initial_indent = " help: ".style(self.theme.styles.help).to_string(); @@ -447,7 +447,7 @@ impl GraphicalReportHandler { fn render_related( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, parent_src: Option<&dyn SourceCode>, ) -> fmt::Result { let src = diagnostic.source_code().or(parent_src); @@ -535,7 +535,7 @@ impl GraphicalReportHandler { fn render_snippets( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, opt_source: Option<&dyn SourceCode>, ) -> fmt::Result { let source = match opt_source { @@ -1361,7 +1361,7 @@ impl GraphicalReportHandler { } impl ReportHandler for GraphicalReportHandler { - fn debug(&self, diagnostic: &(dyn Diagnostic), f: &mut fmt::Formatter<'_>) -> fmt::Result { + fn debug(&self, diagnostic: &dyn Diagnostic, f: &mut fmt::Formatter<'_>) -> fmt::Result { if f.alternate() { return fmt::Debug::fmt(diagnostic, f); } diff --git a/src/handlers/json.rs b/src/handlers/json.rs index 0b4a405..e37064c 100644 --- a/src/handlers/json.rs +++ b/src/handlers/json.rs @@ -60,7 +60,7 @@ impl JSONReportHandler { pub fn render_report( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, ) -> fmt::Result { self._render_report(f, diagnostic, None) } @@ -68,7 +68,7 @@ impl JSONReportHandler { fn _render_report( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, parent_src: Option<&dyn SourceCode>, ) -> fmt::Result { write!(f, r#"{{"message": "{}","#, escape(&diagnostic.to_string()))?; @@ -154,7 +154,7 @@ impl JSONReportHandler { fn render_snippets( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, source: &dyn SourceCode, ) -> fmt::Result { if let Some(mut labels) = diagnostic.labels() { @@ -170,7 +170,7 @@ impl JSONReportHandler { } impl ReportHandler for JSONReportHandler { - fn debug(&self, diagnostic: &(dyn Diagnostic), f: &mut fmt::Formatter<'_>) -> fmt::Result { + fn debug(&self, diagnostic: &dyn Diagnostic, f: &mut fmt::Formatter<'_>) -> fmt::Result { self.render_report(f, diagnostic) } } diff --git a/src/handlers/narratable.rs b/src/handlers/narratable.rs index f8d36ae..8dead98 100644 --- a/src/handlers/narratable.rs +++ b/src/handlers/narratable.rs @@ -69,7 +69,7 @@ impl NarratableReportHandler { pub fn render_report( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, ) -> fmt::Result { self.render_header(f, diagnostic)?; if self.with_cause_chain { @@ -85,7 +85,7 @@ impl NarratableReportHandler { Ok(()) } - fn render_header(&self, f: &mut impl fmt::Write, diagnostic: &(dyn Diagnostic)) -> fmt::Result { + fn render_header(&self, f: &mut impl fmt::Write, diagnostic: &dyn Diagnostic) -> fmt::Result { writeln!(f, "{}", diagnostic)?; let severity = match diagnostic.severity() { Some(Severity::Error) | None => "error", @@ -96,7 +96,7 @@ impl NarratableReportHandler { Ok(()) } - fn render_causes(&self, f: &mut impl fmt::Write, diagnostic: &(dyn Diagnostic)) -> fmt::Result { + fn render_causes(&self, f: &mut impl fmt::Write, diagnostic: &dyn Diagnostic) -> fmt::Result { if let Some(cause_iter) = diagnostic .diagnostic_source() .map(DiagnosticChain::from_diagnostic) @@ -110,7 +110,7 @@ impl NarratableReportHandler { Ok(()) } - fn render_footer(&self, f: &mut impl fmt::Write, diagnostic: &(dyn Diagnostic)) -> fmt::Result { + fn render_footer(&self, f: &mut impl fmt::Write, diagnostic: &dyn Diagnostic) -> fmt::Result { if let Some(help) = diagnostic.help() { writeln!(f, "diagnostic help: {}", help)?; } @@ -126,7 +126,7 @@ impl NarratableReportHandler { fn render_related( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, parent_src: Option<&dyn SourceCode>, ) -> fmt::Result { if let Some(related) = diagnostic.related() { @@ -152,7 +152,7 @@ impl NarratableReportHandler { fn render_snippets( &self, f: &mut impl fmt::Write, - diagnostic: &(dyn Diagnostic), + diagnostic: &dyn Diagnostic, source_code: Option<&dyn SourceCode>, ) -> fmt::Result { if let Some(source) = source_code { @@ -344,7 +344,7 @@ impl NarratableReportHandler { } impl ReportHandler for NarratableReportHandler { - fn debug(&self, diagnostic: &(dyn Diagnostic), f: &mut fmt::Formatter<'_>) -> fmt::Result { + fn debug(&self, diagnostic: &dyn Diagnostic, f: &mut fmt::Formatter<'_>) -> fmt::Result { if f.alternate() { return fmt::Debug::fmt(diagnostic, f); }