run clippy & fix

2026-08-08 22:53:11 -04:00
parent 20c2afb5ad
commit a1076a0731
5 changed files with 231 additions and 230 deletions
@@ -802,116 +802,6 @@ fn render_markdown(source: &str) -> Markup {
    }
 }

-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// Extracts the rendered SVG width from `viewBox="0 0 <width> <height>"`.
-    fn svg_width(svg: &str) -> u32 {
-        let viewbox = svg
-            .split("viewBox=\"")
-            .nth(1)
-            .expect("expected viewBox")
-            .split('"')
-            .next()
-            .unwrap();
-        let width = viewbox.split_whitespace().nth(2).expect("expected width");
-        width.parse().expect("expected numeric width")
-    }
-
-    #[test]
-    fn render_markdown_turns_bullets_into_list_html() {
-        let html = render_markdown("- one\n- two\n").into_string();
-        assert!(html.contains("<ul>"), "expected <ul>, got: {html}");
-        assert!(html.contains("<li>"), "expected <li>, got: {html}");
-        assert!(!html.contains("* one"), "raw bullet leaked through: {html}");
-    }
-
-    #[test]
-    fn render_markdown_renders_emphasis() {
-        let html = render_markdown("**bold** and *italic*").into_string();
-        assert!(html.contains("<strong>"), "expected <strong>, got: {html}");
-        assert!(html.contains("<em>"), "expected <em>, got: {html}");
-    }
-
-    #[test]
-    fn format_date_renders_human_readable_date() {
-        // 2026-08-07T00:00:00Z in Unix seconds.
-        let ts = 1_786_060_800;
-        assert_eq!(format_date(ts), "7 Aug 2026");
-    }
-
-    #[test]
-    fn barcode_svg_renders_code128_svg() {
-        let html = barcode_svg("code128", "601123456789").into_string();
-        assert!(html.contains("<svg"), "expected svg, got: {html}");
-        assert!(html.contains("</svg>"), "expected closing svg, got: {html}");
-    }
-
-    #[test]
-    fn code128_uses_set_c_for_even_digit_numbers() {
-        // Set C (Ć) packs two digits per symbol, so an even-length digit-only
-        // number should be encoded with set C rather than set B.
-        assert_eq!(code128_input("601123456789"), "Ć601123456789");
-        // Non-numeric data falls back to set B.
-        assert_eq!(code128_input("ABC123"), "ƁABC123");
-        assert_eq!(code128_input(""), "Ɓ");
-    }
-
-    #[test]
-    fn code128_odd_digit_numbers_lead_with_set_b_then_switch_to_set_c() {
-        // 21-digit number: first digit in set B, then set C for the rest.
-        assert_eq!(
-            code128_input("606171584511340224537"),
-            "Ɓ6Ć06171584511340224537"
-        );
-    }
-
-    #[test]
-    fn code128_set_c_renders_shorter_than_set_b() {
-        let number = "601123456789";
-        let set_c = barcode_svg("code128", number).into_string();
-        // Force set B by using a non-numeric character so the digit-only
-        // fast path doesn't kick in.
-        let set_b = barcode_svg("code128", &format!("{number} ")).into_string();
-        let width_c = svg_width(&set_c);
-        let width_b = svg_width(&set_b);
-        assert!(
-            width_c < width_b,
-            "expected set C ({width_c}) narrower than set B ({width_b})"
-        );
-    }
-
-    #[test]
-    fn code128_odd_digit_number_renders_shorter_than_pure_set_b() {
-        let number = "606171584511340224537";
-        let mixed = barcode_svg("code128", number).into_string();
-        // Force pure set B by appending a non-numeric character.
-        let set_b = barcode_svg("code128", &format!("{number} ")).into_string();
-        let width_mixed = svg_width(&mixed);
-        let width_b = svg_width(&set_b);
-        assert!(
-            width_mixed < width_b,
-            "expected mixed ({width_mixed}) narrower than set B ({width_b})"
-        );
-    }
-
-    #[test]
-    fn barcode_svg_renders_code39_svg() {
-        let html = barcode_svg("code39", "ABC123").into_string();
-        assert!(html.contains("<svg"), "expected svg, got: {html}");
-    }
-
-    #[test]
-    fn barcode_svg_falls_back_to_text_for_invalid_number() {
-        // Code 39 only supports uppercase letters and digits, so lowercase
-        // input cannot be encoded and falls back to plain text.
-        let html = barcode_svg("code39", "abc").into_string();
-        assert!(!html.contains("<svg"), "expected no svg, got: {html}");
-        assert!(html.contains("abc"), "expected fallback text, got: {html}");
-    }
-}
-
 pub fn list_page(
    user: &User,
    list: &GroceryList,
@@ -1596,7 +1486,7 @@ fn barcode_svg(symbology: &str, number: &str) -> Markup {
                    .generate(&encoded)
                    .ok()
            }),
-        _ => barcoders::sym::code128::Code128::new(&code128_input(number))
+        _ => barcoders::sym::code128::Code128::new(code128_input(number))
            .ok()
            .map(|code| code.encode())
            .and_then(|encoded| {
@@ -1628,7 +1518,7 @@ fn code128_input(number: &str) -> String {
        return format!("Ɓ{number}");
    }
    let len = number.chars().count();
-    if len % 2 == 0 {
+    if len.is_multiple_of(2) {
        format!("Ć{number}")
    } else {
        let (first, rest) = number.split_at(1);
@@ -1723,3 +1613,113 @@ fn initials(name: &str) -> String {
        .collect::<String>()
        .to_uppercase()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Extracts the rendered SVG width from `viewBox="0 0 <width> <height>"`.
+    fn svg_width(svg: &str) -> u32 {
+        let viewbox = svg
+            .split("viewBox=\"")
+            .nth(1)
+            .expect("expected viewBox")
+            .split('"')
+            .next()
+            .unwrap();
+        let width = viewbox.split_whitespace().nth(2).expect("expected width");
+        width.parse().expect("expected numeric width")
+    }
+
+    #[test]
+    fn render_markdown_turns_bullets_into_list_html() {
+        let html = render_markdown("- one\n- two\n").into_string();
+        assert!(html.contains("<ul>"), "expected <ul>, got: {html}");
+        assert!(html.contains("<li>"), "expected <li>, got: {html}");
+        assert!(!html.contains("* one"), "raw bullet leaked through: {html}");
+    }
+
+    #[test]
+    fn render_markdown_renders_emphasis() {
+        let html = render_markdown("**bold** and *italic*").into_string();
+        assert!(html.contains("<strong>"), "expected <strong>, got: {html}");
+        assert!(html.contains("<em>"), "expected <em>, got: {html}");
+    }
+
+    #[test]
+    fn format_date_renders_human_readable_date() {
+        // 2026-08-07T00:00:00Z in Unix seconds.
+        let ts = 1_786_060_800;
+        assert_eq!(format_date(ts), "7 Aug 2026");
+    }
+
+    #[test]
+    fn barcode_svg_renders_code128_svg() {
+        let html = barcode_svg("code128", "601123456789").into_string();
+        assert!(html.contains("<svg"), "expected svg, got: {html}");
+        assert!(html.contains("</svg>"), "expected closing svg, got: {html}");
+    }
+
+    #[test]
+    fn code128_uses_set_c_for_even_digit_numbers() {
+        // Set C (Ć) packs two digits per symbol, so an even-length digit-only
+        // number should be encoded with set C rather than set B.
+        assert_eq!(code128_input("601123456789"), "Ć601123456789");
+        // Non-numeric data falls back to set B.
+        assert_eq!(code128_input("ABC123"), "ƁABC123");
+        assert_eq!(code128_input(""), "Ɓ");
+    }
+
+    #[test]
+    fn code128_odd_digit_numbers_lead_with_set_b_then_switch_to_set_c() {
+        // 21-digit number: first digit in set B, then set C for the rest.
+        assert_eq!(
+            code128_input("606171584511340224537"),
+            "Ɓ6Ć06171584511340224537"
+        );
+    }
+
+    #[test]
+    fn code128_set_c_renders_shorter_than_set_b() {
+        let number = "601123456789";
+        let set_c = barcode_svg("code128", number).into_string();
+        // Force set B by using a non-numeric character so the digit-only
+        // fast path doesn't kick in.
+        let set_b = barcode_svg("code128", &format!("{number} ")).into_string();
+        let width_c = svg_width(&set_c);
+        let width_b = svg_width(&set_b);
+        assert!(
+            width_c < width_b,
+            "expected set C ({width_c}) narrower than set B ({width_b})"
+        );
+    }
+
+    #[test]
+    fn code128_odd_digit_number_renders_shorter_than_pure_set_b() {
+        let number = "606171584511340224537";
+        let mixed = barcode_svg("code128", number).into_string();
+        // Force pure set B by appending a non-numeric character.
+        let set_b = barcode_svg("code128", &format!("{number} ")).into_string();
+        let width_mixed = svg_width(&mixed);
+        let width_b = svg_width(&set_b);
+        assert!(
+            width_mixed < width_b,
+            "expected mixed ({width_mixed}) narrower than set B ({width_b})"
+        );
+    }
+
+    #[test]
+    fn barcode_svg_renders_code39_svg() {
+        let html = barcode_svg("code39", "ABC123").into_string();
+        assert!(html.contains("<svg"), "expected svg, got: {html}");
+    }
+
+    #[test]
+    fn barcode_svg_falls_back_to_text_for_invalid_number() {
+        // Code 39 only supports uppercase letters and digits, so lowercase
+        // input cannot be encoded and falls back to plain text.
+        let html = barcode_svg("code39", "abc").into_string();
+        assert!(!html.contains("<svg"), "expected no svg, got: {html}");
+        assert!(html.contains("abc"), "expected fallback text, got: {html}");
+    }
+}