Clippy

Author: friendlymatthew

src/bin/lato_glyphs.rs

@@ -17,12 +17,9 @@ use std::{
 
 fn dom_new_canvas(i: usize, width: usize, height: usize) -> String {
     let mut out = String::new();
-    out += &format!(
-        "const newCanvas{} = document.createElement(\"canvas\");\n",
-        i
-    );
-    out += &format!("newCanvas{}.width = {};\n", i, width);
-    out += &format!("newCanvas{}.height = {};\n", i, height);
+    out += &format!("const newCanvas{i} = document.createElement(\"canvas\");\n",);
+    out += &format!("newCanvas{i}.width = {width};\n");
+    out += &format!("newCanvas{i}.height = {height};\n");
 
     out
 }
@@ -94,17 +91,14 @@ fn draw_glyph_to_canvas(glyph: &Glyph, key: usize) -> Result<String> {
         while i < points.len() - 2 {
             if i == 0 {
                 let ((x, y), on_curve) = points[0];
-                out += &format!("ctx{key}.moveTo({}, {});\n", x, y);
+                out += &format!("ctx{key}.moveTo({x}, {y});\n");
                 assert!(on_curve, "First point should always be on curve.");
             }
 
             let (mid_x, mid_y) = points[i + 1].0;
             let (next_x, next_y) = points[i + 2].0;
 
-            out += &format!(
-                "ctx{key}.quadraticCurveTo({}, {}, {}, {});\n",
-                mid_x, mid_y, next_x, next_y,
-            );
+            out += &format!("ctx{key}.quadraticCurveTo({mid_x}, {mid_y}, {next_x}, {next_y});\n",);
 
             i += 2;
         }
@@ -162,9 +156,9 @@ fn main() -> Result<()> {
         }
 
         render_js_code += &dom_new_canvas(i, glyph.description.width(), glyph.description.height());
-        render_js_code += &format!("const ctx{} = newCanvas{}.getContext(\"2d\");\n", i, i);
+        render_js_code += &format!("const ctx{i} = newCanvas{i}.getContext(\"2d\");\n");
         render_js_code += &draw_glyph_to_canvas(glyph, i)?;
-        render_js_code += &format!("contentDiv.appendChild(newCanvas{});\n\n", i);
+        render_js_code += &format!("contentDiv.appendChild(newCanvas{i});\n\n");
     }
 
     let dir_path = Path::new("glyph_playground");

src/bin/test_suite.rs

@@ -52,8 +52,8 @@ impl fmt::Display for TestStatus<'_> {
             TestStatus::Passed => write!(f, "Passed"),
             TestStatus::Incorrect => write!(f, "Incorrect"),
             TestStatus::Unsupported => write!(f, "Unsupported"),
-            TestStatus::Panic(msg) => write!(f, "Panic: {:?}", msg),
-            TestStatus::Error(error) => write!(f, "Error: {:?}", error),
+            TestStatus::Panic(msg) => write!(f, "Panic: {msg:?}"),
+            TestStatus::Error(error) => write!(f, "Error: {error:?}"),
         }
     }
 }

src/png/chunk.rs

@@ -72,12 +72,12 @@ impl PngChunk for IHDRChunk<'_> {
     }
 }
 
-#[derive(Debug)]
-pub struct PLTEChunk; // todo!, how does the palette chunk serialize?
+// #[derive(Debug)]
+// pub struct PLTEChunk; // todo!, how does the palette chunk serialize?
 
-impl PngChunk for PLTEChunk {
-    const NAME: [u8; 4] = *b"PLTE";
-}
+// impl PngChunk for PLTEChunk {
+//     const NAME: [u8; 4] = *b"PLTE";
+// }
 
 #[derive(Debug)]
 pub struct IDATChunk<'a> {

src/png/decoder.rs

@@ -136,7 +136,7 @@ impl<'a> PngDecoder<'a> {
         expected_crc == compute_crc(chunk_type, chunk_data)
     }
 
-    fn parse_chunks(&mut self) -> Result<Vec<Chunk>> {
+    fn parse_chunks(&mut self) -> Result<Vec<Chunk<'_>>> {
         let mut chunks = Vec::new();
 
         let mut text_map = BTreeMap::new();
@@ -176,7 +176,7 @@ impl<'a> PngDecoder<'a> {
                     })
                 }
                 b"PLTE" => {
-                    ensure!(length % 3 == 0, "Chunk length not divisible by 3.");
+                    ensure!(length.is_multiple_of(3), "Chunk length not divisible by 3.");
                     ensure!(
                         !chunks.is_empty(),
                         "Empty chunks. Expected ImageHeader chunk."