thanks clippy

Byron · Byron · commit 9193b05b2528 · 2025-01-09T21:02:28.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -394,3 +394,4 @@ stable_sort_primitive = "allow"  # x1
 no_effect_underscore_binding = "allow"  # x1
 empty_docs = "allow"
 too_long_first_doc_paragraph = "allow"
+large_stack_arrays = "allow"
diff --git a/gitoxide-core/src/repository/attributes/query.rs b/gitoxide-core/src/repository/attributes/query.rs
@@ -89,7 +89,7 @@ pub(crate) mod function {
                         let entry = cache.at_entry(
                             path,
                             Some(is_dir_to_mode(
-                                workdir.map_or(false, |wd| wd.join(gix::path::from_bstr(path)).is_dir())
+                                workdir.is_some_and(|wd| wd.join(gix::path::from_bstr(path)).is_dir())
                                     || pattern.signature.contains(gix::pathspec::MagicSignature::MUST_BE_DIR),
                             )),
                         )?;
diff --git a/gitoxide-core/src/repository/clean.rs b/gitoxide-core/src/repository/clean.rs
@@ -128,10 +128,10 @@ pub(crate) mod function {
             let pathspec_includes_entry = match pathspec.as_mut() {
                 None => entry
                     .pathspec_match
-                    .map_or(false, |m| m != gix::dir::entry::PathspecMatch::Excluded),
+                    .is_some_and(|m| m != gix::dir::entry::PathspecMatch::Excluded),
                 Some(pathspec) => pathspec
                     .pattern_matching_relative_path(entry.rela_path.as_bstr(), entry.disk_kind.map(|k| k.is_dir()))
-                    .map_or(false, |m| !m.is_excluded()),
+                    .is_some_and(|m| !m.is_excluded()),
             };
             pruned_entries += usize::from(!pathspec_includes_entry);
             if !pathspec_includes_entry && debug {
diff --git a/gitoxide-core/src/repository/config.rs b/gitoxide-core/src/repository/config.rs
@@ -32,7 +32,7 @@ pub fn list(
         }
 
         let meta = section.meta();
-        if last_meta.map_or(true, |last| last != meta) {
+        if last_meta != Some(meta) {
             write_meta(meta, &mut out)?;
         }
         last_meta = Some(meta);
@@ -41,9 +41,10 @@ pub fn list(
         for event in matter {
             event.write_to(&mut out)?;
         }
-        if it.peek().map_or(false, |(next_section, _)| {
-            next_section.header().name() != section.header().name()
-        }) {
+        if it
+            .peek()
+            .is_some_and(|(next_section, _)| next_section.header().name() != section.header().name())
+        {
             writeln!(&mut out)?;
         }
     }
diff --git a/gitoxide-core/src/repository/exclude.rs b/gitoxide-core/src/repository/exclude.rs
@@ -93,7 +93,7 @@ pub fn query(
                     let entry = cache.at_entry(
                         path,
                         Some(is_dir_to_mode(
-                            workdir.map_or(false, |wd| wd.join(gix::path::from_bstr(path)).is_dir())
+                            workdir.is_some_and(|wd| wd.join(gix::path::from_bstr(path)).is_dir())
                                 || pattern.signature.contains(gix::pathspec::MagicSignature::MUST_BE_DIR),
                         )),
                     )?;
diff --git a/gitoxide-core/src/repository/fetch.rs b/gitoxide-core/src/repository/fetch.rs
@@ -305,7 +305,7 @@ pub(crate) mod function {
             for fix in &map.fixes {
                 match fix {
                     Fix::MappingWithPartialDestinationRemoved { name, spec } => {
-                        if prev_spec.map_or(true, |prev_spec| prev_spec != spec) {
+                        if prev_spec.is_some_and(|prev_spec| prev_spec != spec) {
                             prev_spec = spec.into();
                             spec.to_ref().write_to(&mut err)?;
                             writeln!(err)?;
diff --git a/gitoxide-core/src/repository/index/entries.rs b/gitoxide-core/src/repository/index/entries.rs
@@ -198,7 +198,7 @@ pub(crate) mod function {
                         sms_by_path
                             .iter()
                             .find_map(|(path, sm)| (path == entry_path).then_some(sm))
-                            .filter(|sm| sm.git_dir_try_old_form().map_or(false, |dot_git| dot_git.exists()))
+                            .filter(|sm| sm.git_dir_try_old_form().is_ok_and(|dot_git| dot_git.exists()))
                     })
                 {
                     let sm_path = gix::path::to_unix_separators_on_windows(sm.path()?);
diff --git a/gitoxide-core/src/repository/remote.rs b/gitoxide-core/src/repository/remote.rs
@@ -190,7 +190,7 @@ mod refs_impl {
             for fix in &map.fixes {
                 match fix {
                     Fix::MappingWithPartialDestinationRemoved { name, spec } => {
-                        if prev_spec.map_or(true, |prev_spec| prev_spec != spec) {
+                        if prev_spec.is_some_and(|prev_spec| prev_spec != spec) {
                             prev_spec = spec.into();
                             spec.to_ref().write_to(&mut err)?;
                             writeln!(err)?;
diff --git a/gitoxide-core/src/repository/revision/list.rs b/gitoxide-core/src/repository/revision/list.rs
@@ -108,7 +108,7 @@ pub(crate) mod function {
                 }
             }
             progress.inc();
-            if limit.map_or(false, |limit| limit == progress.step()) {
+            if limit.is_some_and(|limit| limit == progress.step()) {
                 break;
             }
         }
diff --git a/gix-dir/src/walk/classify.rs b/gix-dir/src/walk/classify.rs
@@ -215,7 +215,7 @@ pub fn path(
 
     let is_dir = if symlinks_to_directories_are_ignored_like_directories
         && ctx.excludes.is_some()
-        && kind.map_or(false, |ft| ft == entry::Kind::Symlink)
+        && kind == Some(entry::Kind::Symlink)
     {
         path.metadata().ok().map(|md| is_dir_to_mode(md.is_dir()))
     } else {
diff --git a/gix-filter/examples/arrow.rs b/gix-filter/examples/arrow.rs
@@ -19,7 +19,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     match sub_command.as_str() {
         "process" => {
-            let disallow_delay = next_arg.as_deref().map_or(false, |arg| arg == "disallow-delay");
+            let disallow_delay = next_arg.as_deref() == Some("disallow-delay");
             let mut srv = gix_filter::driver::process::Server::handshake(
                 stdin(),
                 stdout(),
diff --git a/gix-filter/src/driver/process/mod.rs b/gix-filter/src/driver/process/mod.rs
@@ -83,7 +83,7 @@ impl Status {
 
     /// Returns true if this is an `abort` status.
     pub fn is_abort(&self) -> bool {
-        self.message().map_or(false, |m| m == "abort")
+        self.message() == Some("abort")
     }
 
     /// Return true if the status is explicitly set to indicated delayed output processing
diff --git a/gix-pack/src/multi_index/chunk.rs b/gix-pack/src/multi_index/chunk.rs
@@ -69,7 +69,7 @@ pub mod index_names {
                 ascii_path.is_ascii(),
                 "must use ascii bytes for correct size computation"
             );
-            count += (ascii_path.as_bytes().len() + 1/* null byte */) as u64;
+            count += (ascii_path.len() + 1/* null byte */) as u64;
         }
 
         let needed_alignment = CHUNK_ALIGNMENT - (count % CHUNK_ALIGNMENT);
@@ -89,7 +89,7 @@ pub mod index_names {
             let path = path.as_ref().to_str().expect("UTF-8 path");
             out.write_all(path.as_bytes())?;
             out.write_all(&[0])?;
-            written_bytes += path.as_bytes().len() as u64 + 1;
+            written_bytes += path.len() as u64 + 1;
         }
 
         let needed_alignment = CHUNK_ALIGNMENT - (written_bytes % CHUNK_ALIGNMENT);
diff --git a/gix-packetline-blocking/src/line/async_io.rs b/gix-packetline-blocking/src/line/async_io.rs
diff --git a/gix-packetline/src/line/async_io.rs b/gix-packetline/src/line/async_io.rs
@@ -4,7 +4,7 @@ use futures_io::AsyncWrite;
 
 use crate::{encode, BandRef, Channel, ErrorRef, PacketLineRef, TextRef};
 
-impl<'a> BandRef<'a> {
+impl BandRef<'_> {
     /// Serialize this instance to `out`, returning the amount of bytes written.
     ///
     /// The data written to `out` can be decoded with [`Borrowed::decode_band()]`.
@@ -18,14 +18,14 @@ impl<'a> BandRef<'a> {
     }
 }
 
-impl<'a> TextRef<'a> {
+impl TextRef<'_> {
     /// Serialize this instance to `out`, appending a newline if there is none, returning the amount of bytes written.
     pub async fn write_to(&self, out: impl AsyncWrite + Unpin) -> io::Result<usize> {
         encode::text_to_write(self.0, out).await
     }
 }
 
-impl<'a> ErrorRef<'a> {
+impl ErrorRef<'_> {
     /// Serialize this line as error to `out`.
     ///
     /// This includes a marker to allow decoding it outside of a side-band channel, returning the amount of bytes written.
@@ -34,7 +34,7 @@ impl<'a> ErrorRef<'a> {
     }
 }
 
-impl<'a> PacketLineRef<'a> {
+impl PacketLineRef<'_> {
     /// Serialize this instance to `out` in git `packetline` format, returning the amount of bytes written to `out`.
     pub async fn write_to(&self, out: impl AsyncWrite + Unpin) -> io::Result<usize> {
         match self {
diff --git a/gix-ref/src/store/file/transaction/commit.rs b/gix-ref/src/store/file/transaction/commit.rs
@@ -72,7 +72,7 @@ impl Transaction<'_, '_> {
                             }
                         };
                         if let Some((previous, new_oid)) = log_update {
-                            let do_update = previous.as_ref().map_or(true, |previous| previous != new_oid);
+                            let do_update = previous.as_ref() != Some(new_oid);
                             if do_update {
                                 self.store.reflog_create_or_append(
                                     change.update.name.as_ref(),
diff --git a/gix-submodule/src/lib.rs b/gix-submodule/src/lib.rs
@@ -4,8 +4,6 @@
 
 use std::{borrow::Cow, collections::BTreeMap};
 
-use bstr::BStr;
-
 /// All relevant information about a git module, typically from `.gitmodules` files.
 ///
 /// Note that overrides from other configuration might be relevant, which is why this type
@@ -64,7 +62,7 @@ impl File {
         let mut config_to_append = gix_config::File::new(config.meta_owned());
         let mut prev_name = None;
         for ((module_name, field), values) in values {
-            if prev_name.map_or(true, |pn: &BStr| pn != module_name) {
+            if prev_name != Some(module_name) {
                 config_to_append
                     .new_section("submodule", Some(Cow::Owned(module_name.to_owned())))
                     .expect("all names come from valid configuration, so remain valid");
diff --git a/gix-validate/src/path.rs b/gix-validate/src/path.rs
@@ -185,7 +185,7 @@ fn check_win_devices_and_illegal_characters(input: &BStr) -> Option<component::E
 }
 
 fn is_symlink(mode: Option<component::Mode>) -> bool {
-    mode.map_or(false, |m| m == component::Mode::Symlink)
+    mode == Some(component::Mode::Symlink)
 }
 
 fn is_dot_hfs(input: &BStr, search_case_insensitive: &str) -> bool {
diff --git a/gix/src/config/tree/sections/mod.rs b/gix/src/config/tree/sections/mod.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::unnecessary_literal_bound)]
 #![allow(missing_docs)]
 
 /// The `author` top-level section.
diff --git a/gix/src/remote/url/scheme_permission.rs b/gix/src/remote/url/scheme_permission.rs
@@ -63,7 +63,7 @@ impl SchemePermission {
             .map(|value| Protocol::ALLOW.try_into_allow(value, None))
             .transpose()?;
 
-        let mut saw_user = allow.map_or(false, |allow| allow == Allow::User);
+        let mut saw_user = allow == Some(Allow::User);
         let allow_per_scheme = match config.sections_by_name_and_filter("protocol", &mut filter) {
             Some(it) => {
                 let mut map = BTreeMap::default();
diff --git a/tests/tools/src/lib.rs b/tests/tools/src/lib.rs
@@ -685,8 +685,7 @@ fn is_lfs_pointer_file(path: &Path) -> bool {
     std::fs::OpenOptions::new()
         .read(true)
         .open(path)
-        .and_then(|mut f| f.read_exact(&mut buf))
-        .map_or(false, |_| buf.starts_with(PREFIX))
+        .is_ok_and(|mut f| f.read_exact(&mut buf).is_ok_and(|_| buf.starts_with(PREFIX)))
 }
 
 /// The `script_identity` will be baked into the soon to be created `archive` as it identifies the script

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ pub fn list(`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`let meta = section.meta();`
`35`		`- if last_meta.map_or(true, \|last\| last != meta) {`
	`35`	`+ if last_meta != Some(meta) {`
`36`	`36`	`write_meta(meta, &mut out)?;`
`37`	`37`	`}`
`38`	`38`	`last_meta = Some(meta);`
`@@ -41,9 +41,10 @@ pub fn list(`
`41`	`41`	`for event in matter {`
`42`	`42`	`event.write_to(&mut out)?;`
`43`	`43`	`}`
`44`		`- if it.peek().map_or(false, \|(next_section, _)\| {`
`45`		`- next_section.header().name() != section.header().name()`
`46`		`- }) {`
	`44`	`+ if it`
	`45`	`+ .peek()`
	`46`	`+ .is_some_and(\|(next_section, _)\| next_section.header().name() != section.header().name())`
	`47`	`+ {`
`47`	`48`	`writeln!(&mut out)?;`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ pub(crate) mod function {`
`198`	`198`	`sms_by_path`
`199`	`199`	`.iter()`
`200`	`200`	`.find_map(\|(path, sm)\| (path == entry_path).then_some(sm))`
`201`		`- .filter(\|sm\| sm.git_dir_try_old_form().map_or(false, \|dot_git\| dot_git.exists()))`
	`201`	`+ .filter(\|sm\| sm.git_dir_try_old_form().is_ok_and(\|dot_git\| dot_git.exists()))`
`202`	`202`	`})`
`203`	`203`	`{`
`204`	`204`	`let sm_path = gix::path::to_unix_separators_on_windows(sm.path()?);`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ pub(crate) mod function {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`progress.inc();`
`111`		`- if limit.map_or(false, \|limit\| limit == progress.step()) {`
	`111`	`+ if limit.is_some_and(\|limit\| limit == progress.step()) {`
`112`	`112`	`break;`
`113`	`113`	`}`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ pub fn path(`
`215`	`215`
`216`	`216`	`let is_dir = if symlinks_to_directories_are_ignored_like_directories`
`217`	`217`	`&& ctx.excludes.is_some()`
`218`		`- && kind.map_or(false, \|ft\| ft == entry::Kind::Symlink)`
	`218`	`+ && kind == Some(entry::Kind::Symlink)`
`219`	`219`	`{`
`220`	`220`	`path.metadata().ok().map(\|md\| is_dir_to_mode(md.is_dir()))`
`221`	`221`	`} else {`