Make clippy happy

mitsuhiko · Oct 7, 2023 · 86f68a6 · 86f68a6
1 parent e85ddb0
commit 86f68a6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/src/text/inline.rs b/src/text/inline.rs
@@ -310,7 +310,7 @@ fn test_line_ops_inline() {
         "Hello World\nsome stuff here\nsome more stuff here\n\nAha stuff here\nand more stuff",
         "Stuff\nHello World\nsome amazing stuff here\nsome more stuff here\n",
     );
-    assert_eq!(diff.newline_terminated(), true);
+    assert!(diff.newline_terminated());
     let changes = diff
         .ops()
         .iter()
@@ -326,7 +326,7 @@ fn test_serde() {
         "Hello World\nsome stuff here\nsome more stuff here\n\nAha stuff here\nand more stuff",
         "Stuff\nHello World\nsome amazing stuff here\nsome more stuff here\n",
     );
-    assert_eq!(diff.newline_terminated(), true);
+    assert!(diff.newline_terminated());
     let changes = diff
         .ops()
         .iter()

diff --git a/src/text/mod.rs b/src/text/mod.rs
@@ -632,7 +632,7 @@ fn test_unified_diff() {
         "Hello World\nsome stuff here\nsome more stuff here\n",
         "Hello World\nsome amazing stuff here\nsome more stuff here\n",
     );
-    assert_eq!(diff.newline_terminated(), true);
+    assert!(diff.newline_terminated());
     insta::assert_snapshot!(&diff
         .unified_diff()
         .context_radius(3)
@@ -645,7 +645,7 @@ fn test_line_ops() {
     let a = "Hello World\nsome stuff here\nsome more stuff here\n";
     let b = "Hello World\nsome amazing stuff here\nsome more stuff here\n";
     let diff = TextDiff::from_lines(a, b);
-    assert_eq!(diff.newline_terminated(), true);
+    assert!(diff.newline_terminated());
     let changes = diff
         .ops()
         .iter()
@@ -670,7 +670,7 @@ fn test_line_ops() {
 #[test]
 fn test_virtual_newlines() {
     let diff = TextDiff::from_lines("a\nb", "a\nc\n");
-    assert_eq!(diff.newline_terminated(), true);
+    assert!(diff.newline_terminated());
     let changes = diff
         .ops()
         .iter()

diff --git a/src/types.rs b/src/types.rs
@@ -351,26 +351,29 @@ impl DiffOp {
             DiffOp::Equal { old_index, len, .. } => {
                 Some((ChangeTag::Equal, &old[old_index..old_index + len]))
                     .into_iter()
-                    .chain(None.into_iter())
+                    .chain(None)
             }
             DiffOp::Insert {
                 new_index, new_len, ..
             } => Some((ChangeTag::Insert, &new[new_index..new_index + new_len]))
                 .into_iter()
-                .chain(None.into_iter()),
+                .chain(None),
             DiffOp::Delete {
                 old_index, old_len, ..
             } => Some((ChangeTag::Delete, &old[old_index..old_index + old_len]))
                 .into_iter()
-                .chain(None.into_iter()),
+                .chain(None),
             DiffOp::Replace {
                 old_index,
                 old_len,
                 new_index,
                 new_len,
             } => Some((ChangeTag::Delete, &old[old_index..old_index + old_len]))
                 .into_iter()
-                .chain(Some((ChangeTag::Insert, &new[new_index..new_index + new_len])).into_iter()),
+                .chain(Some((
+                    ChangeTag::Insert,
+                    &new[new_index..new_index + new_len],
+                ))),
         }
     }
 

diff --git a/src/udiff.rs b/src/udiff.rs
@@ -317,10 +317,10 @@ where
 ///
 /// `n` configures [`UnifiedDiff::context_radius`] and
 /// `header` configures [`UnifiedDiff::header`] when not `None`.
-pub fn unified_diff<'old, 'new>(
+pub fn unified_diff(
     alg: Algorithm,
-    old: &'old str,
-    new: &'new str,
+    old: &str,
+    new: &str,
     n: usize,
     header: Option<(&str, &str)>,
 ) -> String {

diff --git a/src/utils.rs b/src/utils.rs
@@ -155,7 +155,7 @@ impl<'x, T: DiffableStr + ?Sized> TextDiffRemapper<'x, T> {
             DiffOp::Equal { old_index, len, .. } => {
                 Some((ChangeTag::Equal, self.old.slice(old_index..old_index + len)))
                     .into_iter()
-                    .chain(None.into_iter())
+                    .chain(None)
             }
             DiffOp::Insert {
                 new_index, new_len, ..
@@ -164,15 +164,15 @@ impl<'x, T: DiffableStr + ?Sized> TextDiffRemapper<'x, T> {
                 self.new.slice(new_index..new_index + new_len),
             ))
             .into_iter()
-            .chain(None.into_iter()),
+            .chain(None),
             DiffOp::Delete {
                 old_index, old_len, ..
             } => Some((
                 ChangeTag::Delete,
                 self.old.slice(old_index..old_index + old_len),
             ))
             .into_iter()
-            .chain(None.into_iter()),
+            .chain(None),
             DiffOp::Replace {
                 old_index,
                 old_len,
@@ -183,13 +183,10 @@ impl<'x, T: DiffableStr + ?Sized> TextDiffRemapper<'x, T> {
                 self.old.slice(old_index..old_index + old_len),
             ))
             .into_iter()
-            .chain(
-                Some((
-                    ChangeTag::Insert,
-                    self.new.slice(new_index..new_index + new_len),
-                ))
-                .into_iter(),
-            ),
+            .chain(Some((
+                ChangeTag::Insert,
+                self.new.slice(new_index..new_index + new_len),
+            ))),
         }
         .map(|(tag, opt_val)| (tag, opt_val.expect("slice out of bounds")))
     }