Fix various clippy lints

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   # Pinned toolchain for linting
-  ACTIONS_LINTS_TOOLCHAIN: 1.76.0
+  ACTIONS_LINTS_TOOLCHAIN: 1.86.0
 
 jobs:
   tests-stable:

src/floatformat.rs

@@ -49,7 +49,7 @@ pub(crate) fn number_to_json(ieee_f64: f64) -> Result<String, NumberSerializatio
     // Special case: NaN and Infinity are invalid in JSON.
     // The JCS specification mandates that implementations must reject them.
     if (ieee_u64 & INVALID_PATTERN) == INVALID_PATTERN {
-        return Err(NumberSerializationError::Unserializable.into());
+        return Err(NumberSerializationError::Unserializable);
     }
 
     // Special case: Eliminate "-0" as mandated by the ES6/JCS specifications.
@@ -68,7 +68,7 @@ pub(crate) fn number_to_json(ieee_f64: f64) -> Result<String, NumberSerializatio
 
     // ES6 defines a specific range where numbers should be rendered in fixed-point
     // format ('f'), and scientific notation ('e') otherwise.
-    let es6_formatted = if num >= 1e-6 && num < 1e21 {
+    let es6_formatted = if (1e-6..1e21).contains(&num) {
         // For numbers within this range, use fixed-point notation.
         // Rust's default `to_string` for floats is suitable as it doesn't produce
         // unnecessary trailing zeros (e.g., 25.0 becomes "25").
@@ -85,7 +85,7 @@ pub(crate) fn number_to_json(ieee_f64: f64) -> Result<String, NumberSerializatio
             if scientific
                 .chars()
                 .nth(next_char_pos)
-                .map_or(false, |c| c.is_ascii_digit())
+                .is_some_and(|c| c.is_ascii_digit())
             {
                 scientific.insert(next_char_pos, '+');
             }

src/lib.rs

@@ -93,7 +93,7 @@ enum WriterTarget<'w, W> {
     Buffer(&'w mut Vec<u8>),
 }
 
-impl<'w, W: Write> Write for WriterTarget<'w, W> {
+impl<W: Write> Write for WriterTarget<'_, W> {
     fn write(&mut self, buf: &[u8]) -> Result<usize> {
         match self {
             WriterTarget::Underlying(w) => w.write(buf),
@@ -222,7 +222,7 @@ impl Formatter for CanonicalFormatter {
         if !v.key_done {
             return Ok(());
         }
-        return CompactFormatter.begin_string(&mut v.next_value);
+        CompactFormatter.begin_string(&mut v.next_value)
     }
 
     fn end_string<W: Write + ?Sized>(&mut self, writer: &mut W) -> Result<()> {
@@ -232,7 +232,7 @@ impl Formatter for CanonicalFormatter {
         if !v.key_done {
             return Ok(());
         }
-        return CompactFormatter.end_string(&mut v.next_value);
+        CompactFormatter.end_string(&mut v.next_value)
     }
 
     fn write_string_fragment<W: Write + ?Sized>(
@@ -268,7 +268,7 @@ impl Formatter for CanonicalFormatter {
             };
             writer.write_all(v)
         } else {
-            return CompactFormatter.write_char_escape(&mut writer, char_escape);
+            CompactFormatter.write_char_escape(&mut writer, char_escape)
         }
     }
 
@@ -367,7 +367,7 @@ mod tests {
     fn test_object_key() {
         let cases = [("\n", "1"), ("\r", "<script>"), ("ö", "דּ")];
         for case in cases {
-            assert_eq!(case.0.cmp(&case.1), Ordering::Less);
+            assert_eq!(case.0.cmp(case.1), Ordering::Less);
         }
         let mut v = cases
             .iter()
@@ -541,9 +541,8 @@ mod tests {
                 prop_oneof![
                     // Take the inner strategy and make the two recursive cases.
                     prop::collection::vec(inner.clone(), 0..10).prop_map(Value::Array),
-                    prop::collection::hash_map(S, inner, 0..10).prop_map(|v| {
-                        v.into_iter().map(|(k, v)| (k, Value::from(v))).collect()
-                    }),
+                    prop::collection::hash_map(S, inner, 0..10)
+                        .prop_map(|v| { v.into_iter().collect() }),
                 ]
             },
         )
@@ -552,7 +551,6 @@ mod tests {
     proptest! {
         #[test]
         fn roundtrip_rfc8785(v in arbitrary_json()) {
-            let v: serde_json::Value = v.into();
             let buf = encode!(&v).unwrap();
             let v2: serde_json::Value = serde_json::from_slice(&buf)
                 .map_err(|e| format!("Failed to parse {v:?} -> {}: {e}", String::from_utf8_lossy(&buf))).unwrap();
@@ -658,7 +656,6 @@ mod tests {
         fn crosscheck_olpc_cjson(v in arbitrary_json()) {
             use olpc_cjson::CanonicalFormatter;
 
-            let v: serde_json::Value = v.into();
             let mut olpc_cjson_serialized = Vec::new();
             let mut ser = serde_json::Serializer::with_formatter(&mut olpc_cjson_serialized, CanonicalFormatter::new());
             prop_assume!(v.serialize(&mut ser).is_ok());