thanks clippy

Author: Byron

gitoxide-core/src/repository/attributes/validate_baseline.rs

@@ -100,7 +100,7 @@ pub(crate) mod function {
                     });
 
                     let stdout = std::io::BufReader::new(child.stdout.take().expect("we configured it"));
-                    let mut lines = stdout.lines().filter_map(Result::ok).peekable();
+                    let mut lines = stdout.lines().map_while(Result::ok).peekable();
                     while let Some(baseline) = parse_attributes(&mut lines) {
                         if tx_base.send(baseline).is_err() {
                             child.kill().ok();

gix-actor/tests/identity/mod.rs

@@ -3,7 +3,7 @@ use gix_actor::Identity;
 
 #[test]
 fn round_trip() -> gix_testtools::Result {
-    static DEFAULTS: &'static [&'static [u8]] =     &[
+    static DEFAULTS: &[&[u8]] =     &[
         b"Sebastian Thiel <[email protected]>",
         ".. ☺️Sebastian 王知明 Thiel🙌 .. <[email protected]>".as_bytes(),
         b".. whitespace  \t  is explicitly allowed    - unicode aware trimming must be done elsewhere  <[email protected]>"

gix-actor/tests/signature/mod.rs

@@ -64,7 +64,7 @@ fn trim() {
 
 #[test]
 fn round_trip() -> Result<(), Box<dyn std::error::Error>> {
-    static DEFAULTS: &'static [&'static [u8]] =     &[
+    static DEFAULTS: &[&[u8]] =     &[
         b"Sebastian Thiel <[email protected]> 1 -0030",
         ".. ☺️Sebastian 王知明 Thiel🙌 .. <[email protected]> 1528473343 +0230".as_bytes(),
         b".. whitespace  \t  is explicitly allowed    - unicode aware trimming must be done elsewhere  <[email protected]> 1528473343 +0230"

gix-features/tests/pipe.rs

@@ -49,7 +49,7 @@ mod io {
         writer.write_all(b"b\nc\n").expect("success");
         drop(writer);
         assert_eq!(
-            reader.lines().flat_map(Result::ok).collect::<Vec<_>>(),
+            reader.lines().map_while(Result::ok).collect::<Vec<_>>(),
             vec!["a", "b", "c"]
         )
     }

gix-pack/src/cache/delta/traverse/resolve.rs

@@ -413,11 +413,10 @@ fn decompress_all_at_once_with(b: &[u8], decompressed_len: usize, out: &mut Vec<
     INFLATE.with(|inflate| {
         let mut inflate = inflate.borrow_mut();
         inflate.reset();
-        let res = inflate.once(b, out).map_err(|err| Error::ZlibInflate {
+        inflate.once(b, out).map_err(|err| Error::ZlibInflate {
             source: err,
             message: "Failed to decompress entry",
-        });
-        res
+        })
     })?;
     Ok(())
 }

gix-transport/tests/client/blocking_io/http/mod.rs

@@ -269,7 +269,7 @@ fn handshake_v1() -> crate::Result {
     let refs = refs
         .expect("v1 protocol provides refs")
         .lines()
-        .flat_map(Result::ok)
+        .map_while(Result::ok)
         .collect::<Vec<_>>();
     assert_eq!(
         refs,

gix/tests/repository/remote.rs

@@ -192,7 +192,7 @@ mod find_remote {
         let repo = remote::repo("url-rewriting");
 
         let baseline = std::fs::read(repo.git_dir().join("baseline.git"))?;
-        let mut baseline = baseline.lines().filter_map(Result::ok);
+        let mut baseline = baseline.lines().map_while(Result::ok);
         let expected_fetch_url: BString = baseline.next().expect("fetch").into();
         let expected_push_url: BString = baseline.next().expect("push").into();
 
@@ -223,7 +223,7 @@ mod find_remote {
         let repo = remote::repo("bad-url-rewriting");
 
         let baseline = std::fs::read(repo.git_dir().join("baseline.git"))?;
-        let mut baseline = baseline.lines().filter_map(Result::ok);
+        let mut baseline = baseline.lines().map_while(Result::ok);
         let expected_fetch_url: BString = baseline.next().expect("fetch").into();
         let expected_push_url: BString = baseline.next().expect("push").into();
         assert_eq!(

gix/tests/repository/worktree.rs

@@ -105,7 +105,7 @@ mod with_core_worktree_config {
         std::fs::read(git_dir.join("status.baseline"))
             .unwrap()
             .lines()
-            .filter_map(Result::ok)
+            .map_while(Result::ok)
             .filter(|line| line.contains(" D "))
             .count()
     }