From 85ea9eefc62aced087a5f694dfcc76154fc1171b Mon Sep 17 00:00:00 2001
From: Peter Ammon <rf@fishshell.com>
Date: Mon, 14 Apr 2025 20:00:13 -0700
Subject: [PATCH] Fight off some clipplies

---
 printf/src/fmt_fp/mod.rs    |  1 +
 src/autoload.rs             |  5 +++--
 src/builtins/string/trim.rs | 10 ++++++----
 src/highlight/tests.rs      |  1 +
 src/lib.rs                  |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/printf/src/fmt_fp/mod.rs b/printf/src/fmt_fp/mod.rs
index c6c1ddb21..74c05e874 100644
--- a/printf/src/fmt_fp/mod.rs
+++ b/printf/src/fmt_fp/mod.rs
@@ -279,6 +279,7 @@ fn format_a(mut y: f64, params: FormatParams<'_, impl Write>) -> Result<usize, E
 
     // Compute the number of hex digits in the mantissa after the decimal.
     // -1 for leading 1 bit (we are to the range [1, 2)), then divide by 4, rounding up.
+    #[allow(clippy::manual_div_ceil)]
     const MANTISSA_HEX_DIGITS: usize = (MANTISSA_BITS - 1 + 3) / 4;
     if had_prec && prec < MANTISSA_HEX_DIGITS {
         // Decide how many least-significant bits to round off the mantissa.
diff --git a/src/autoload.rs b/src/autoload.rs
index 03d9b60c4..b738211ee 100644
--- a/src/autoload.rs
+++ b/src/autoload.rs
@@ -132,8 +132,9 @@ pub fn resolve_command(&mut self, cmd: &wstr, env: &dyn Environment) -> Option<A
 
         // HACK: In cargo tests, this used to never load functions
         // It will hang for reasons unrelated to this.
-        #[cfg(test)]
-        return None;
+        if cfg!(test) {
+            return None;
+        }
 
         #[cfg(feature = "embed-data")]
         {
diff --git a/src/builtins/string/trim.rs b/src/builtins/string/trim.rs
index dddcaeb73..f121e28fd 100644
--- a/src/builtins/string/trim.rs
+++ b/src/builtins/string/trim.rs
@@ -73,11 +73,13 @@ fn handle(
         };
 
         for (arg, want_newline) in arguments(args, optind, streams) {
-            let trim_start = self.left.then(|| to_trim_start(&arg)).unwrap_or(0);
+            let trim_start = if self.left { to_trim_start(&arg) } else { 0 };
             // collision is only an issue if the whole string is getting trimmed
-            let trim_end = (self.right && trim_start != arg.len())
-                .then(|| to_trim_end(&arg))
-                .unwrap_or(0);
+            let trim_end = if self.right && trim_start != arg.len() {
+                to_trim_end(&arg)
+            } else {
+                0
+            };
 
             ntrim += trim_start + trim_end;
             if !self.quiet {
diff --git a/src/highlight/tests.rs b/src/highlight/tests.rs
index f1b96b6d9..5715a0189 100644
--- a/src/highlight/tests.rs
+++ b/src/highlight/tests.rs
@@ -663,6 +663,7 @@ macro_rules! validate {
 /// command.
 #[test]
 #[serial]
+#[allow(clippy::needless_range_loop)]
 fn test_trailing_spaces_after_command() {
     let _cleanup = test_init();
     let parser = TestParser::new();
diff --git a/src/lib.rs b/src/lib.rs
index f101f9590..2dbe7378a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,12 +4,12 @@
 #![allow(unknown_lints)]
 #![allow(unstable_name_collisions)]
 #![allow(rustdoc::private_intra_doc_links)]
-#![allow(clippy::assigning_clones)]
 #![allow(clippy::bool_assert_comparison)]
 #![allow(clippy::collapsible_if)]
 #![allow(clippy::comparison_chain)]
 #![allow(clippy::derivable_impls)]
 #![allow(clippy::doc_lazy_continuation)]
+#![allow(clippy::doc_overindented_list_items)]
 #![allow(clippy::field_reassign_with_default)]
 #![allow(clippy::get_first)]
 #![allow(clippy::if_same_then_else)]