Fixup Copilot commits and thank clippy

Author: Byron

etc/msrv-badge.svg

@@ -110,7 +110,7 @@ pub(crate) mod write {
 
     impl From<Error> for std::io::Error {
         fn from(err: Error) -> Self {
-            std::io::Error::new(std::io::ErrorKind::Other, err)
+            std::io::Error::other(err)
         }
     }
 

gix-actor/src/signature/mod.rs

@@ -160,8 +160,7 @@ where
                 opts.tree_prefix.as_ref(),
             )?;
         }
-        ar.finish()
-            .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+        ar.finish().map_err(std::io::Error::other)?;
     }
 
     Ok(())
@@ -179,25 +178,25 @@ fn append_zip_entry<W: std::io::Write + std::io::Seek>(
     let file_opts = zip::write::SimpleFileOptions::default()
         .compression_method(zip::CompressionMethod::Deflated)
         .compression_level(compression_level)
-        .large_file(entry.bytes_remaining().map_or(true, |len| len > u32::MAX as usize))
+        .large_file(entry.bytes_remaining().is_none_or(|len| len > u32::MAX as usize))
         .last_modified_time(mtime)
         .unix_permissions(if entry.mode.is_executable() { 0o755 } else { 0o644 });
     let path = add_prefix(entry.relative_path(), tree_prefix).into_owned();
     match entry.mode.kind() {
         gix_object::tree::EntryKind::Blob | gix_object::tree::EntryKind::BlobExecutable => {
             ar.start_file(path.to_string(), file_opts)
-                .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+                .map_err(std::io::Error::other)?;
             std::io::copy(&mut entry, ar)?;
         }
         gix_object::tree::EntryKind::Tree | gix_object::tree::EntryKind::Commit => {
             ar.add_directory(path.to_string(), file_opts)
-                .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+                .map_err(std::io::Error::other)?;
         }
         gix_object::tree::EntryKind::Link => {
             use bstr::ByteSlice;
             std::io::copy(&mut entry, buf)?;
             ar.add_symlink(path.to_string(), buf.as_bstr().to_string(), file_opts)
-                .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+                .map_err(std::io::Error::other)?;
         }
     }
     Ok(())

gix-archive/src/write.rs

@@ -115,9 +115,10 @@ mod prepare {
         /// If neither this method nor [`with_shell()`](Self::with_shell()) is called, commands are
         /// always executed verbatim and directly, without the use of a shell.
         pub fn command_may_be_shell_script(mut self) -> Self {
-            self.use_shell = self.command.to_str().map_or(true, |cmd| {
-                cmd.as_bytes().find_byteset(b"|&;<>()$`\\\"' \t\n*?[#~=%").is_some()
-            });
+            self.use_shell = self
+                .command
+                .to_str()
+                .is_none_or(|cmd| cmd.as_bytes().find_byteset(b"|&;<>()$`\\\"' \t\n*?[#~=%").is_some());
             self
         }
 
@@ -289,7 +290,7 @@ mod prepare {
                         let mut cmd = Command::new(shell);
                         cmd.arg("-c");
                         if !prep.args.is_empty() {
-                            if prep.command.to_str().map_or(true, |cmd| !cmd.contains("$@")) {
+                            if prep.command.to_str().is_none_or(|cmd| !cmd.contains("$@")) {
                                 if prep.quote_command {
                                     if let Ok(command) = gix_path::os_str_into_bstr(&prep.command) {
                                         prep.command = gix_path::from_bstring(gix_quote::single(command)).into();

gix-command/src/lib.rs

@@ -226,7 +226,7 @@ mod context {
 mod prepare {
     use std::sync::LazyLock;
 
-    static SH: Lazy<&'static str> = Lazy::new(|| {
+    static SH: LazyLock<&'static str> = LazyLock::new(|| {
         gix_path::env::shell()
             .to_str()
             .expect("`prepare` tests must be run where 'sh' path is valid Unicode")

gix-command/tests/command.rs

@@ -376,7 +376,7 @@ impl<'event> File<'event> {
             nl: &impl AsRef<[u8]>,
         ) {
             if !ends_with_newline(lhs.as_ref(), nl, true)
-                && !rhs.first().map_or(true, |e| e.to_bstr_lossy().starts_with(nl.as_ref()))
+                && !rhs.first().is_none_or(|e| e.to_bstr_lossy().starts_with(nl.as_ref()))
             {
                 lhs.push(Event::Newline(Cow::Owned(nl.as_ref().into())));
             }

gix-config/src/file/access/mutate.rs

@@ -71,7 +71,7 @@ impl<'event> SectionMut<'_, 'event> {
                 text: Cow::Owned({
                     let mut c = Vec::with_capacity(comment.len());
                     let mut bytes = comment.iter().peekable();
-                    if !bytes.peek().map_or(true, |b| b.is_ascii_whitespace()) {
+                    if !bytes.peek().is_none_or(|b| b.is_ascii_whitespace()) {
                         c.insert(0, b' ');
                     }
                     c.extend(bytes.map(|b| if *b == b'\n' { b' ' } else { *b }));
@@ -194,7 +194,7 @@ impl<'event> SectionMut<'_, 'event> {
         assert!(
             whitespace
                 .as_deref()
-                .map_or(true, |ws| ws.iter().all(u8::is_ascii_whitespace)),
+                .is_none_or(|ws| ws.iter().all(u8::is_ascii_whitespace)),
             "input whitespace must only contain whitespace characters."
         );
         self.whitespace.pre_key = whitespace;

gix-config/src/file/mutable/section.rs

@@ -313,7 +313,7 @@ fn from_bytes<'a, 'b>(
             .into();
         }
         event => {
-            if filter.map_or(true, |f| f(&event)) {
+            if filter.is_none_or(|f| f(&event)) {
                 events.push(convert(event));
             }
         }

gix-config/src/parse/events.rs

@@ -96,9 +96,8 @@ fn section<'i>(
     dispatch: &mut dyn FnMut(Event<'i>),
 ) -> ModalResult<(), NomError<&'i [u8]>> {
     let start = i.checkpoint();
-    let header = section_header(i).map_err(|e| {
+    let header = section_header(i).inspect_err(|_err| {
         i.reset(&start);
-        e
     })?;
     dispatch(Event::SectionHeader(header));
 

gix-config/src/parse/nom/mod.rs

@@ -13,8 +13,7 @@ pub fn main() -> Result<(), gix_credentials::program::main::Error> {
                     password: Some("pass".into()),
                     ..context
                 })),
-                program::main::Action::Erase => Err(std::io::Error::new(
-                    std::io::ErrorKind::Other,
+                program::main::Action::Erase => Err(std::io::Error::other(
                     "Refusing to delete credentials for demo purposes",
                 )),
                 program::main::Action::Store => Ok(None),