Fix formatting and clippy warnings

Author: m4rc1e

diffenator3-lib/src/render/colorpainter.rs

@@ -238,8 +238,10 @@ impl<'a> ColorPainter for SkiaPainter<'a> {
                     to_spread(extend),
                     self.transform,
                 ) {
-                    let mut paint = Paint::default();
-                    paint.shader = shader;
+                    let paint = Paint {
+                        shader,
+                        ..Paint::default()
+                    };
                     tmp.fill_path(
                         &path,
                         &paint,
@@ -273,8 +275,10 @@ impl<'a> ColorPainter for SkiaPainter<'a> {
                     to_spread(extend),
                     self.transform,
                 ) {
-                    let mut paint = Paint::default();
-                    paint.shader = shader;
+                    let paint = Paint {
+                        shader,
+                        ..Paint::default()
+                    };
                     tmp.fill_path(
                         &path,
                         &paint,
@@ -306,8 +310,10 @@ impl<'a> ColorPainter for SkiaPainter<'a> {
                     to_spread(extend),
                     self.transform,
                 ) {
-                    let mut paint = Paint::default();
-                    paint.shader = shader;
+                    let paint = Paint {
+                        shader,
+                        ..Paint::default()
+                    };
                     tmp.fill_path(
                         &path,
                         &paint,
@@ -393,8 +399,10 @@ impl<'a> ColorPainter for SkiaPainter<'a> {
                 CompositeMode::Plus => tiny_skia::BlendMode::Plus,
                 _ => tiny_skia::BlendMode::SourceOver,
             };
-            let mut paint = PixmapPaint::default();
-            paint.blend_mode = blend;
+            let paint = PixmapPaint {
+                blend_mode: blend,
+                ..PixmapPaint::default()
+            };
             let pm = self.current_pixmap();
             pm.draw_pixmap(0, 0, layer.as_ref(), &paint, TsTransform::identity(), None);
         }

diffenator3-lib/src/render/colorrenderer.rs

@@ -129,8 +129,7 @@ impl<'a> ColorRenderer<'a> {
         let (bearing_x, bearing_y, tile_w, tile_h) = self.glyph_tile_bounds(glyph_id);
 
         let outlines = self.font.outline_glyphs();
-        let mut painter =
-            SkiaPainter::new(tile_w, tile_h, &self.palette, outlines, self.location);
+        let mut painter = SkiaPainter::new(tile_w, tile_h, &self.palette, outlines, self.location);
 
         // Transform: maps font-unit origin (0,0) to pixel (-bearing_x, bearing_y)
         // within the tile, with Y-flip (font Y-up → pixel Y-down).

diffenator3-lib/src/render/mod.rs

@@ -150,10 +150,12 @@ pub(crate) fn diff_many_words(
                     .is_none_or(|scp| word.chars().all(|c| scp.contains(&(c as u32))))
             })
             .map(|word| {
-                let renderer_a = tl_a
-                    .get_or(|| RefCell::new(ColorRenderer::new(font_a, font_size, direction, script)));
-                let renderer_b = tl_b
-                    .get_or(|| RefCell::new(ColorRenderer::new(font_b, font_size, direction, script)));
+                let renderer_a = tl_a.get_or(|| {
+                    RefCell::new(ColorRenderer::new(font_a, font_size, direction, script))
+                });
+                let renderer_b = tl_b.get_or(|| {
+                    RefCell::new(ColorRenderer::new(font_b, font_size, direction, script))
+                });
 
                 let (buffer_a, img_a) = renderer_a.borrow_mut().render_string(word)?;
                 if buffer_a
@@ -191,10 +193,10 @@ pub(crate) fn diff_many_words(
                     .is_none_or(|scp| word.chars().all(|c| scp.contains(&(c as u32))))
             })
             .map(|word| {
-                let renderer_a =
-                    tl_a.get_or(|| RefCell::new(Renderer::new(font_a, font_size, direction, script)));
-                let renderer_b =
-                    tl_b.get_or(|| RefCell::new(Renderer::new(font_b, font_size, direction, script)));
+                let renderer_a = tl_a
+                    .get_or(|| RefCell::new(Renderer::new(font_a, font_size, direction, script)));
+                let renderer_b = tl_b
+                    .get_or(|| RefCell::new(Renderer::new(font_b, font_size, direction, script)));
 
                 let (buffer_a, commands_a) =
                     renderer_a.borrow_mut().string_to_positioned_glyphs(word)?;
@@ -303,9 +305,7 @@ pub(crate) fn diff_many_words(
                     continue;
                 }
             }
-            let Some((buffer_a, commands_a)) =
-                renderer_a.string_to_positioned_glyphs(&word)
-            else {
+            let Some((buffer_a, commands_a)) = renderer_a.string_to_positioned_glyphs(&word) else {
                 continue;
             };
             if buffer_a.split('|').all(|glyph| seen_glyphs.contains(glyph)) {
@@ -314,9 +314,7 @@ pub(crate) fn diff_many_words(
             for glyph in buffer_a.split('|') {
                 seen_glyphs.insert(glyph.to_string());
             }
-            let Some((buffer_b, commands_b)) =
-                renderer_b.string_to_positioned_glyphs(&word)
-            else {
+            let Some((buffer_b, commands_b)) = renderer_b.string_to_positioned_glyphs(&word) else {
                 continue;
             };
             if commands_a == commands_b {