fix(clippy): misc clippy fixes

zkat · Apr 4, 2022 · b98b098 · b98b098
1 parent a0b972f
commit b98b098
Show file tree

Hide file tree

Showing 5 changed files with 152 additions and 155 deletions.
diff --git a/src/handlers/graphical.rs b/src/handlers/graphical.rs
@@ -165,13 +165,10 @@ impl GraphicalReportHandler {
                 "".to_string()
             };
             let link = format!(
-                "\u{1b}]8;;{}\u{1b}\\{}\u{1b}]8;;\u{1b}\\",
+                "\u{1b}]8;;{}\u{1b}\\{}{}\u{1b}]8;;\u{1b}\\",
                 url,
-                format!(
-                    "{}{}",
                     code.style(severity_style),
                     "(link)".style(self.theme.styles.link)
-                )
             );
             write!(header, "{}", link)?;
             writeln!(f, "{}", header)?;
@@ -417,7 +414,7 @@ impl GraphicalReportHandler {
 
             // And _now_ we can print out the line text itself!
             if let Some(w) = self.tab_width {
-                let text = line.text.replace("\t", " ".repeat(w).as_str());
+                let text = line.text.replace('\t', " ".repeat(w).as_str());
                 writeln!(f, "{}", text)?;
             } else {
                 writeln!(f, "{}", line.text)?;

diff --git a/tests/graphical.rs b/tests/graphical.rs
@@ -846,7 +846,7 @@ fn related_source_code_propagation() -> Result<(), MietteError> {
 
     let src = "source\n  text\n    here".to_string();
     let err = MyBad {
-        src: NamedSource::new("bad_file.rs", src.clone()),
+        src: NamedSource::new("bad_file.rs", src),
         highlight: (9, 4).into(),
         related: vec![InnerError {
             highlight: (0, 6).into(),

diff --git a/tests/narrated.rs b/tests/narrated.rs
@@ -631,7 +631,7 @@ fn related_source_code_propagation() -> Result<(), MietteError> {
 
     let src = "source\n  text\n    here".to_string();
     let err = MyBad {
-        src: NamedSource::new("bad_file.rs", src.clone()),
+        src: NamedSource::new("bad_file.rs", src),
         highlight: (9, 4).into(),
         related: vec![InnerError {
             highlight: (0, 6).into(),

diff --git a/tests/test_derive_attr.rs b/tests/test_derive_attr.rs
@@ -1,147 +1,147 @@
-// Testing of the `diagnostic` attr used by derive(Diagnostic)
-use miette::{Diagnostic, LabeledSpan, NamedSource, SourceSpan};
-use thiserror::Error;
-
-#[test]
-fn enum_uses_base_attr() {
-    #[derive(Debug, Diagnostic, Error)]
-    #[error("oops!")]
-    #[diagnostic(code(error::on::base))]
-    enum MyBad {
-        Only {
-            #[source_code]
-            src: NamedSource,
-            #[label("this bit here")]
-            highlight: SourceSpan,
-        },
-    }
-
-    let src = "source\n  text\n    here".to_string();
-    let err = MyBad::Only {
-        src: NamedSource::new("bad_file.rs", src),
-        highlight: (9, 4).into(),
-    };
-    assert_eq!(err.code().unwrap().to_string(), "error::on::base");
-}
-
-#[test]
-fn enum_uses_variant_attr() {
-    #[derive(Debug, Diagnostic, Error)]
-    #[error("oops!")]
-    enum MyBad {
-        #[diagnostic(code(error::on::variant))]
-        Only {
-            #[source_code]
-            src: NamedSource,
-            #[label("this bit here")]
-            highlight: SourceSpan,
-        },
-    }
-
-    let src = "source\n  text\n    here".to_string();
-    let err = MyBad::Only {
-        src: NamedSource::new("bad_file.rs", src),
-        highlight: (9, 4).into(),
-    };
-    assert_eq!(err.code().unwrap().to_string(), "error::on::variant");
-}
-
-#[test]
-fn multiple_attrs_allowed_on_item() {
-    #[derive(Debug, Diagnostic, Error)]
-    #[error("oops!")]
-    #[diagnostic(code(error::on::base))]
-    #[diagnostic(help("try doing it correctly"))]
-    enum MyBad {
-        Only {
-            #[source_code]
-            src: NamedSource,
-            #[label("this bit here")]
-            highlight: SourceSpan,
-        },
-    }
-
-    let src = "source\n  text\n    here".to_string();
-    let err = MyBad::Only {
-        src: NamedSource::new("bad_file.rs", src),
-        highlight: (9, 4).into(),
-    };
-    assert_eq!(err.code().unwrap().to_string(), "error::on::base");
-    assert_eq!(err.help().unwrap().to_string(), "try doing it correctly");
-}
-
-#[test]
-fn multiple_attrs_allowed_on_variant() {
-    #[derive(Debug, Diagnostic, Error)]
-    #[error("oops!")]
-    enum MyBad {
-        #[diagnostic(code(error::on::variant))]
-        #[diagnostic(help("try doing it correctly"))]
-        Only {
-            #[source_code]
-            src: NamedSource,
-            #[label("this bit here")]
-            highlight: SourceSpan,
-        },
-    }
-
-    let src = "source\n  text\n    here".to_string();
-    let err = MyBad::Only {
-        src: NamedSource::new("bad_file.rs", src),
-        highlight: (9, 4).into(),
-    };
-    assert_eq!(err.code().unwrap().to_string(), "error::on::variant");
-    assert_eq!(err.help().unwrap().to_string(), "try doing it correctly");
-}
-
-#[test]
-fn attrs_can_be_split_between_item_and_variants() {
-    #[derive(Debug, Diagnostic, Error)]
-    #[error("oops!")]
-    #[diagnostic(code(error::on::base))]
-    enum MyBad {
-        #[diagnostic(help("try doing it correctly"))]
-        #[diagnostic(url("https://example.com/foo/bar"))]
-        Only {
-            #[source_code]
-            src: NamedSource,
-            #[label("this bit here")]
-            highlight: SourceSpan,
-        },
-    }
-
-    let src = "source\n  text\n    here".to_string();
-    let err = MyBad::Only {
-        src: NamedSource::new("bad_file.rs", src),
-        highlight: (9, 4).into(),
-    };
-    assert_eq!(err.code().unwrap().to_string(), "error::on::base");
-    assert_eq!(err.help().unwrap().to_string(), "try doing it correctly");
-    assert_eq!(
-        err.url().unwrap().to_string(),
-        "https://example.com/foo/bar".to_string()
-    );
-}
-
-#[test]
-fn attr_not_required() {
-    #[derive(Debug, Diagnostic, Error)]
-    #[error("oops!")]
-    enum MyBad {
-        Only {
-            #[source_code]
-            src: NamedSource,
-            #[label("this bit here")]
-            highlight: SourceSpan,
-        },
-    }
-
-    let src = "source\n  text\n    here".to_string();
-    let err = MyBad::Only {
-        src: NamedSource::new("bad_file.rs", src),
-        highlight: (9, 4).into(),
-    };
-    let err_span = err.labels().unwrap().next().unwrap();
-    let expectation = LabeledSpan::new(Some("this bit here".into()), 9usize.into(), 4usize.into());
-    assert_eq!(err_span, expectation);
-}
+// Testing of the `diagnostic` attr used by derive(Diagnostic)
+use miette::{Diagnostic, LabeledSpan, NamedSource, SourceSpan};
+use thiserror::Error;
+
+#[test]
+fn enum_uses_base_attr() {
+    #[derive(Debug, Diagnostic, Error)]
+    #[error("oops!")]
+    #[diagnostic(code(error::on::base))]
+    enum MyBad {
+        Only {
+            #[source_code]
+            src: NamedSource,
+            #[label("this bit here")]
+            highlight: SourceSpan,
+        },
+    }
+
+    let src = "source\n  text\n    here".to_string();
+    let err = MyBad::Only {
+        src: NamedSource::new("bad_file.rs", src),
+        highlight: (9, 4).into(),
+    };
+    assert_eq!(err.code().unwrap().to_string(), "error::on::base");
+}
+
+#[test]
+fn enum_uses_variant_attr() {
+    #[derive(Debug, Diagnostic, Error)]
+    #[error("oops!")]
+    enum MyBad {
+        #[diagnostic(code(error::on::variant))]
+        Only {
+            #[source_code]
+            src: NamedSource,
+            #[label("this bit here")]
+            highlight: SourceSpan,
+        },
+    }
+
+    let src = "source\n  text\n    here".to_string();
+    let err = MyBad::Only {
+        src: NamedSource::new("bad_file.rs", src),
+        highlight: (9, 4).into(),
+    };
+    assert_eq!(err.code().unwrap().to_string(), "error::on::variant");
+}
+
+#[test]
+fn multiple_attrs_allowed_on_item() {
+    #[derive(Debug, Diagnostic, Error)]
+    #[error("oops!")]
+    #[diagnostic(code(error::on::base))]
+    #[diagnostic(help("try doing it correctly"))]
+    enum MyBad {
+        Only {
+            #[source_code]
+            src: NamedSource,
+            #[label("this bit here")]
+            highlight: SourceSpan,
+        },
+    }
+
+    let src = "source\n  text\n    here".to_string();
+    let err = MyBad::Only {
+        src: NamedSource::new("bad_file.rs", src),
+        highlight: (9, 4).into(),
+    };
+    assert_eq!(err.code().unwrap().to_string(), "error::on::base");
+    assert_eq!(err.help().unwrap().to_string(), "try doing it correctly");
+}
+
+#[test]
+fn multiple_attrs_allowed_on_variant() {
+    #[derive(Debug, Diagnostic, Error)]
+    #[error("oops!")]
+    enum MyBad {
+        #[diagnostic(code(error::on::variant))]
+        #[diagnostic(help("try doing it correctly"))]
+        Only {
+            #[source_code]
+            src: NamedSource,
+            #[label("this bit here")]
+            highlight: SourceSpan,
+        },
+    }
+
+    let src = "source\n  text\n    here".to_string();
+    let err = MyBad::Only {
+        src: NamedSource::new("bad_file.rs", src),
+        highlight: (9, 4).into(),
+    };
+    assert_eq!(err.code().unwrap().to_string(), "error::on::variant");
+    assert_eq!(err.help().unwrap().to_string(), "try doing it correctly");
+}
+
+#[test]
+fn attrs_can_be_split_between_item_and_variants() {
+    #[derive(Debug, Diagnostic, Error)]
+    #[error("oops!")]
+    #[diagnostic(code(error::on::base))]
+    enum MyBad {
+        #[diagnostic(help("try doing it correctly"))]
+        #[diagnostic(url("https://example.com/foo/bar"))]
+        Only {
+            #[source_code]
+            src: NamedSource,
+            #[label("this bit here")]
+            highlight: SourceSpan,
+        },
+    }
+
+    let src = "source\n  text\n    here".to_string();
+    let err = MyBad::Only {
+        src: NamedSource::new("bad_file.rs", src),
+        highlight: (9, 4).into(),
+    };
+    assert_eq!(err.code().unwrap().to_string(), "error::on::base");
+    assert_eq!(err.help().unwrap().to_string(), "try doing it correctly");
+    assert_eq!(
+        err.url().unwrap().to_string(),
+        "https://example.com/foo/bar".to_string()
+    );
+}
+
+#[test]
+fn attr_not_required() {
+    #[derive(Debug, Diagnostic, Error)]
+    #[error("oops!")]
+    enum MyBad {
+        Only {
+            #[source_code]
+            src: NamedSource,
+            #[label("this bit here")]
+            highlight: SourceSpan,
+        },
+    }
+
+    let src = "source\n  text\n    here".to_string();
+    let err = MyBad::Only {
+        src: NamedSource::new("bad_file.rs", src),
+        highlight: (9, 4).into(),
+    };
+    let err_span = err.labels().unwrap().next().unwrap();
+    let expectation = LabeledSpan::new(Some("this bit here".into()), 9usize, 4usize);
+    assert_eq!(err_span, expectation);
+}
diff --git a/tests/test_json.rs b/tests/test_json.rs
@@ -834,7 +834,7 @@ mod json_report_handler {
 
         let src = "source\n  text\n    here".to_string();
         let err = MyBad {
-            src: NamedSource::new("bad_file.rs", src.clone()),
+            src: NamedSource::new("bad_file.rs", src),
             highlight: (9, 4).into(),
             related: vec![
                 InnerError {