From a23114fffe34ad21515948349b12055ea892feda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justus=20Fl=C3=BCgel?= Date: Mon, 10 Mar 2025 15:58:43 +0100 Subject: [PATCH] Make rustfmt no longer complain over lines that are too long which it can't format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Justus Flügel --- miette-derive/src/code.rs | 18 +++++++++++++++--- miette-derive/src/diagnostic.rs | 8 ++++++-- miette-derive/src/forward.rs | 8 ++++++-- miette-derive/src/help.rs | 12 +++++++++--- miette-derive/src/label.rs | 28 +++++++++++++++++++++++----- miette-derive/src/related.rs | 4 +++- miette-derive/src/severity.rs | 8 +++++--- miette-derive/src/trait_bounds.rs | 18 ++++++++++++++---- miette-derive/src/url.rs | 4 +++- src/handlers/graphical.rs | 16 ++++++++++------ 10 files changed, 94 insertions(+), 30 deletions(-) diff --git a/miette-derive/src/code.rs b/miette-derive/src/code.rs index 22dc795..4cf63cf 100644 --- a/miette-derive/src/code.rs +++ b/miette-derive/src/code.rs @@ -56,13 +56,25 @@ impl Code { let code = &code.as_ref()?.0; Some(match fields { syn::Fields::Named(_) => { - quote! { Self::#ident { .. } => std::option::Option::Some(std::boxed::Box::new(#code)), } + quote! { + Self::#ident { .. } => { + std::option::Option::Some(std::boxed::Box::new(#code)) + }, + } } syn::Fields::Unnamed(_) => { - quote! { Self::#ident(..) => std::option::Option::Some(std::boxed::Box::new(#code)), } + quote! { + Self::#ident(..) => { + std::option::Option::Some(std::boxed::Box::new(#code)) + }, + } } syn::Fields::Unit => { - quote! { Self::#ident => std::option::Option::Some(std::boxed::Box::new(#code)), } + quote! { + Self::#ident => { + std::option::Option::Some(std::boxed::Box::new(#code)) + }, + } } }) }, diff --git a/miette-derive/src/diagnostic.rs b/miette-derive/src/diagnostic.rs index 3206e83..629051e 100644 --- a/miette-derive/src/diagnostic.rs +++ b/miette-derive/src/diagnostic.rs @@ -312,7 +312,9 @@ impl Diagnostic { forward.gen_struct_method(WhichFn::DiagnosticSource); quote! { - impl #impl_generics miette::Diagnostic for #ident #ty_generics #where_clause { + impl #impl_generics miette::Diagnostic + for #ident #ty_generics + #where_clause { #code_method #help_method #url_method @@ -372,7 +374,9 @@ impl Diagnostic { .and_then(|x| x.gen_struct()) .or_else(|| forward(WhichFn::DiagnosticSource)); quote! { - impl #impl_generics miette::Diagnostic for #ident #ty_generics #where_clause { + impl #impl_generics miette::Diagnostic + for #ident #ty_generics + #where_clause { #code_body #help_body #sev_body diff --git a/miette-derive/src/forward.rs b/miette-derive/src/forward.rs index 88c437c..11cb3bb 100644 --- a/miette-derive/src/forward.rs +++ b/miette-derive/src/forward.rs @@ -72,10 +72,14 @@ impl WhichFn { fn severity(&self) -> std::option::Option }, Self::Related => quote! { - fn related(&self) -> std::option::Option + '_>> + fn related(&self) -> std::option::Option< + std::boxed::Box + '_> + > }, Self::Labels => quote! { - fn labels(&self) -> std::option::Option + '_>> + fn labels(&self) -> std::option::Option< + std::boxed::Box + '_> + > }, Self::SourceCode => quote! { fn source_code(&self) -> std::option::Option<&dyn miette::SourceCode> diff --git a/miette-derive/src/help.rs b/miette-derive/src/help.rs index 1c21054..398533c 100644 --- a/miette-derive/src/help.rs +++ b/miette-derive/src/help.rs @@ -94,7 +94,9 @@ impl Help { Help::Display(display) => { let (fmt, args) = display.expand_shorthand_cloned(&display_members); Some(quote! { - Self::#ident #display_pat => std::option::Option::Some(std::boxed::Box::new(format!(#fmt #args))), + Self::#ident #display_pat => { + std::option::Option::Some(std::boxed::Box::new(format!(#fmt #args))) + }, }) } Help::Field(member, ty) => { @@ -123,7 +125,9 @@ impl Help { Help::Display(display) => { let (fmt, args) = display.expand_shorthand_cloned(&display_members); Some(quote! { - fn help(&self) -> std::option::Option> { + fn help(&self) -> std::option::Option< + std::boxed::Box + > { #[allow(unused_variables, deprecated)] let Self #display_pat = self; std::option::Option::Some(std::boxed::Box::new(format!(#fmt #args))) @@ -133,7 +137,9 @@ impl Help { Help::Field(member, ty) => { let var = quote! { __miette_internal_var }; Some(quote! { - fn help(&self) -> std::option::Option> { + fn help(&self) -> std::option::Option< + std::boxed::Box + > { #[allow(unused_variables, deprecated)] let Self #display_pat = self; use miette::macro_helpers::ToOption; diff --git a/miette-derive/src/label.rs b/miette-derive/src/label.rs index 7fa1404..191b7b3 100644 --- a/miette-derive/src/label.rs +++ b/miette-derive/src/label.rs @@ -253,7 +253,9 @@ impl Labels { Some(quote! { #[allow(unused_variables)] - fn labels(&self) -> std::option::Option + '_>> { + fn labels(&self) -> std::option::Option< + std::boxed::Box + '_> + > { use miette::macro_helpers::ToOption; let Self #display_pat = self; @@ -263,7 +265,10 @@ impl Labels { .into_iter() #(#collections_chain)*; - std::option::Option::Some(Box::new(labels_iter.filter(Option::is_some).map(Option::unwrap))) + std::option::Option::Some(Box::new( + labels_iter + .filter_map(|x| x) + )) } }) } @@ -276,7 +281,12 @@ impl Labels { let (display_pat, display_members) = display_pat_members(fields); labels.as_ref().and_then(|labels| { let variant_labels = labels.0.iter().filter_map(|label| { - let Label { span, label, ty, lbl_ty } = label; + let Label { + span, + label, + ty, + lbl_ty, + } = label; if *lbl_ty == LabelType::Collection { return None; } @@ -313,7 +323,12 @@ impl Labels { }) }); let collections_chain = labels.0.iter().filter_map(|label| { - let Label { span, label, ty: _, lbl_ty } = label; + let Label { + span, + label, + ty: _, + lbl_ty, + } = label; if *lbl_ty != LabelType::Collection { return None; } @@ -357,7 +372,10 @@ impl Labels { ] .into_iter() #(#collections_chain)*; - std::option::Option::Some(std::boxed::Box::new(labels_iter.filter(Option::is_some).map(Option::unwrap))) + std::option::Option::Some(std::boxed::Box::new( + labels_iter + .filter_map(|x| x) + )) } }), } diff --git a/miette-derive/src/related.rs b/miette-derive/src/related.rs index de189cf..cd87899 100644 --- a/miette-derive/src/related.rs +++ b/miette-derive/src/related.rs @@ -78,7 +78,9 @@ impl Related { pub(crate) fn gen_struct(&self) -> Option { let rel = &self.0; Some(quote! { - fn related<'a>(&'a self) -> std::option::Option + 'a>> { + fn related<'a>(&'a self) -> std::option::Option< + std::boxed::Box + 'a> + > { use ::core::borrow::Borrow; std::option::Option::Some(std::boxed::Box::new( self.#rel.iter().map(|x| -> &(dyn miette::Diagnostic) { &*x.borrow() }) diff --git a/miette-derive/src/severity.rs b/miette-derive/src/severity.rs index 4f26e4e..9d66d41 100644 --- a/miette-derive/src/severity.rs +++ b/miette-derive/src/severity.rs @@ -71,9 +71,11 @@ impl Severity { syn::Fields::Unnamed(_) => quote! { (..) }, syn::Fields::Unit => quote! {}, }; - Some( - quote! { Self::#ident #fields => std::option::Option::Some(miette::Severity::#severity), }, - ) + Some(quote! { + Self::#ident #fields => { + std::option::Option::Some(miette::Severity::#severity) + }, + }) }, ) } diff --git a/miette-derive/src/trait_bounds.rs b/miette-derive/src/trait_bounds.rs index a1912ca..e69d3c1 100644 --- a/miette-derive/src/trait_bounds.rs +++ b/miette-derive/src/trait_bounds.rs @@ -412,8 +412,10 @@ impl TraitBoundStore { let type_opts_deref_item = self .0 .entry(( - Some(syn::parse_quote!(for<'__miette_internal_lt>)), - syn::parse_quote!(<<#ty as ::std::iter::IntoIterator>::Item as ::std::ops::Deref>::Target), + Some(syn::parse_quote! {for<'__miette_internal_lt>}), + syn::parse_quote! { + <<#ty as ::std::iter::IntoIterator>::Item as ::std::ops::Deref>::Target + }, )) .or_default(); type_opts_deref_item.register_to_owned_usage(); @@ -421,8 +423,16 @@ impl TraitBoundStore { let type_opts_deref_to_owned_item = self .0 .entry(( - Some(syn::parse_quote!(for<'__miette_internal_lt>)), - syn::parse_quote!(<<<#ty as ::std::iter::IntoIterator>::Item as ::std::ops::Deref>::Target as ::std::borrow::ToOwned>::Owned), + Some(syn::parse_quote! {for<'__miette_internal_lt>}), + syn::parse_quote! { + < + < + <#ty as ::std::iter::IntoIterator>::Item + as ::std::ops::Deref + >::Target + as ::std::borrow::ToOwned + >::Owned + }, )) .or_default(); type_opts_deref_to_owned_item.register_label_usage(); diff --git a/miette-derive/src/url.rs b/miette-derive/src/url.rs index 734d1a4..70af09d 100644 --- a/miette-derive/src/url.rs +++ b/miette-derive/src/url.rs @@ -96,7 +96,9 @@ impl Url { } }; Some(quote! { - Self::#ident #pat => std::option::Option::Some(std::boxed::Box::new(format!(#fmt #args))), + Self::#ident #pat => { + std::option::Option::Some(std::boxed::Box::new(format!(#fmt #args))) + }, }) }, ) diff --git a/src/handlers/graphical.rs b/src/handlers/graphical.rs index 37b6bf8..90e457f 100644 --- a/src/handlers/graphical.rs +++ b/src/handlers/graphical.rs @@ -1401,13 +1401,17 @@ impl Line { /// text on this line fn span_applies(&self, span: &FancySpan) -> bool { let spanlen = if span.len() == 0 { 1 } else { span.len() }; - // Span starts in this line - (span.offset() >= self.offset && span.offset() < self.offset + self.length) - // Span passes through this line - || (span.offset() < self.offset && span.offset() + spanlen > self.offset + self.length) //todo - // Span ends on this line - || (span.offset() + spanlen > self.offset && span.offset() + spanlen <= self.offset + self.length) + let span_starts_this_line = + span.offset() >= self.offset && span.offset() < self.offset + self.length; + + let span_passes_through_this_line = + span.offset() < self.offset && span.offset() + spanlen > self.offset + self.length; + + let span_ends_on_this_line = span.offset() + spanlen > self.offset + && span.offset() + spanlen <= self.offset + self.length; + + span_starts_this_line || span_passes_through_this_line || span_ends_on_this_line } /// Returns whether `span` should be visible on this line in the gutter (so this excludes spans