Apply clippy lints

zbraniecki · zbraniecki · commit 542e41e9a767 · 2021-09-04T12:54:42.000-07:00
diff --git a/src/display_list/from_snippet.rs b/src/display_list/from_snippet.rs
@@ -39,7 +39,7 @@ impl<'a> Iterator for CursorLines<'a> {
                     ret
                 })
                 .or_else(|| {
-                    let ret = Some((&self.0[..], EndLine::EOF));
+                    let ret = Some((self.0, EndLine::EOF));
                     self.0 = "";
                     ret
                 })
@@ -79,7 +79,7 @@ fn format_title(annotation: snippet::Annotation<'_>) -> DisplayLine<'_> {
         annotation: Annotation {
             annotation_type: DisplayAnnotationType::from(annotation.annotation_type),
             id: annotation.id,
-            label: format_label(Some(&label), Some(DisplayTextStyle::Emphasis)),
+            label: format_label(Some(label), Some(DisplayTextStyle::Emphasis)),
         },
         source_aligned: false,
         continuation: false,
@@ -182,7 +182,7 @@ fn fold_body(mut body: Vec<DisplayLine<'_>>) -> Vec<DisplayLine<'_>> {
     enum Line {
         Fold(usize),
         Source(usize),
-    };
+    }
 
     let mut lines = vec![];
     let mut no_annotation_lines_counter = 0;
@@ -193,8 +193,8 @@ fn fold_body(mut body: Vec<DisplayLine<'_>>) -> Vec<DisplayLine<'_>> {
                 line: DisplaySourceLine::Annotation { .. },
                 ..
             } => {
+                let fold_start = idx - no_annotation_lines_counter;
                 if no_annotation_lines_counter > 2 {
-                    let fold_start = idx - no_annotation_lines_counter;
                     let fold_end = idx;
                     let pre_len = if no_annotation_lines_counter > 8 {
                         4
@@ -224,8 +224,7 @@ fn fold_body(mut body: Vec<DisplayLine<'_>>) -> Vec<DisplayLine<'_>> {
                         lines.push(Line::Source(i));
                     }
                 } else {
-                    let start = idx - no_annotation_lines_counter;
-                    for (i, _) in body.iter().enumerate().take(idx).skip(start) {
+                    for (i, _) in body.iter().enumerate().take(idx).skip(fold_start) {
                         lines.push(Line::Source(i));
                     }
                 }
@@ -377,7 +376,7 @@ fn format_body(
                                     annotation: Annotation {
                                         annotation_type,
                                         id: None,
-                                        label: format_label(Some(&annotation.label), None),
+                                        label: format_label(Some(annotation.label), None),
                                     },
                                     range,
                                     annotation_type: DisplayAnnotationType::from(
@@ -490,7 +489,7 @@ fn format_body(
                                     annotation: Annotation {
                                         annotation_type,
                                         id: None,
-                                        label: format_label(Some(&annotation.label), None),
+                                        label: format_label(Some(annotation.label), None),
                                     },
                                     range,
                                     annotation_type: DisplayAnnotationType::from(
diff --git a/src/formatter/mod.rs b/src/formatter/mod.rs
@@ -132,7 +132,7 @@ impl<'a> DisplayList<'a> {
         for fragment in label {
             match fragment.style {
                 DisplayTextStyle::Regular => fragment.content.fmt(f)?,
-                DisplayTextStyle::Emphasis => emphasis_style.paint(&fragment.content, f)?,
+                DisplayTextStyle::Emphasis => emphasis_style.paint(fragment.content, f)?,
             }
         }
         Ok(())
@@ -298,7 +298,7 @@ impl<'a> DisplayList<'a> {
                     f,
                 )?;
 
-                if !is_annotation_empty(&annotation) {
+                if !is_annotation_empty(annotation) {
                     f.write_char(' ')?;
                     color.paint_fn(
                         Box::new(|f| {
@@ -361,18 +361,15 @@ impl<'a> DisplayList<'a> {
                 if *source_aligned {
                     if *continuation {
                         format_repeat_char(' ', lineno_width + 3, f)?;
-                        self.format_annotation(annotation, *continuation, false, f)
                     } else {
                         let lineno_color = self.stylesheet.get_style(StyleClass::LineNo);
                         format_repeat_char(' ', lineno_width, f)?;
                         f.write_char(' ')?;
                         lineno_color.paint("=", f)?;
                         f.write_char(' ')?;
-                        self.format_annotation(annotation, *continuation, false, f)
                     }
-                } else {
-                    self.format_annotation(annotation, *continuation, false, f)
                 }
+                self.format_annotation(annotation, *continuation, false, f)
             }
         }
     }
diff --git a/tests/snippet/mod.rs b/tests/snippet/mod.rs
@@ -74,7 +74,7 @@ where
         label_right: usize,
         column_width: usize,
         max_line_len: usize,
-    };
+    }
 
     Option::<Wrapper>::deserialize(deserializer).map(|opt_wrapped: Option<Wrapper>| {
         opt_wrapped.map(|wrapped: Wrapper| {

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ impl<'a> DisplayList<'a> {`
`132`	`132`	`for fragment in label {`
`133`	`133`	`match fragment.style {`
`134`	`134`	`DisplayTextStyle::Regular => fragment.content.fmt(f)?,`
`135`		`- DisplayTextStyle::Emphasis => emphasis_style.paint(&fragment.content, f)?,`
	`135`	`+ DisplayTextStyle::Emphasis => emphasis_style.paint(fragment.content, f)?,`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`Ok(())`
`@@ -298,7 +298,7 @@ impl<'a> DisplayList<'a> {`
`298`	`298`	`f,`
`299`	`299`	`)?;`
`300`	`300`
`301`		`- if !is_annotation_empty(&annotation) {`
	`301`	`+ if !is_annotation_empty(annotation) {`
`302`	`302`	`f.write_char(' ')?;`
`303`	`303`	`color.paint_fn(`
`304`	`304`	`Box::new(\|f\| {`
`@@ -361,18 +361,15 @@ impl<'a> DisplayList<'a> {`
`361`	`361`	`if *source_aligned {`
`362`	`362`	`if *continuation {`
`363`	`363`	`format_repeat_char(' ', lineno_width + 3, f)?;`
`364`		`- self.format_annotation(annotation, *continuation, false, f)`
`365`	`364`	`} else {`
`366`	`365`	`let lineno_color = self.stylesheet.get_style(StyleClass::LineNo);`
`367`	`366`	`format_repeat_char(' ', lineno_width, f)?;`
`368`	`367`	`f.write_char(' ')?;`
`369`	`368`	`lineno_color.paint("=", f)?;`
`370`	`369`	`f.write_char(' ')?;`
`371`		`- self.format_annotation(annotation, *continuation, false, f)`
`372`	`370`	`}`
`373`		`- } else {`
`374`		`- self.format_annotation(annotation, *continuation, false, f)`
`375`	`371`	`}`
	`372`	`+ self.format_annotation(annotation, *continuation, false, f)`
`376`	`373`	`}`
`377`	`374`	`}`
`378`	`375`	`}`