Reformat + clippy

LaurenzV · Dec 1, 2024 · 3394f6f · 3394f6f
1 parent ac1fe73
commit 3394f6f
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 30 deletions.
diff --git a/crates/krilla/src/object/image.rs b/crates/krilla/src/object/image.rs
@@ -260,7 +260,7 @@ impl Image {
 
                 Some(Repr::Sampled(SampledRepr {
                     color_channel: deflate_encode(color_channel),
-                    alpha_channel: image.alpha_channel().map(|a| deflate_encode(a)),
+                    alpha_channel: image.alpha_channel().map(deflate_encode),
                     bits_per_component: image.bits_per_component(),
                 }))
             }),
@@ -693,7 +693,10 @@ mod tests {
     use crate::image::Image;
     use crate::serialize::SerializerContext;
     use crate::surface::Surface;
-    use crate::tests::{load_custom_image, load_custom_image_with_icc, load_gif_image, load_jpg_image, load_png_image, load_webp_image};
+    use crate::tests::{
+        load_custom_image, load_custom_image_with_icc, load_gif_image, load_jpg_image,
+        load_png_image, load_webp_image,
+    };
     use crate::Document;
     use krilla_macros::{snapshot, visreg};
     use tiny_skia_path::Size;
@@ -726,7 +729,10 @@ mod tests {
     // ICC profile should be ignored.
     #[snapshot]
     fn image_custom_rgb8_png_invalid_icc(sc: &mut SerializerContext) {
-        sc.register_image(load_custom_image_with_icc("rgb8.png", std::fs::read(crate::tests::ASSETS_PATH.join("icc/eciCMYK_v2.icc")).unwrap()));
+        sc.register_image(load_custom_image_with_icc(
+            "rgb8.png",
+            std::fs::read(crate::tests::ASSETS_PATH.join("icc/eciCMYK_v2.icc")).unwrap(),
+        ));
     }
 
     #[snapshot]

diff --git a/crates/krilla/src/stream.rs b/crates/krilla/src/stream.rs
@@ -262,7 +262,7 @@ pub(crate) struct FilterStream<'a> {
     filters: StreamFilters,
 }
 
-impl<'a> FilterStream<'a> {
+impl FilterStream<'_> {
     pub fn encoded_data(&self) -> &[u8] {
         &self.content
     }

diff --git a/crates/krilla/src/tests/mod.rs b/crates/krilla/src/tests/mod.rs
@@ -110,7 +110,7 @@ struct TestImage {
     original_dynamic: Arc<DynamicImage>,
     alpha_channel: OnceLock<Option<Arc<Vec<u8>>>>,
     actual_dynamic: OnceLock<Arc<DynamicImage>>,
-    icc: Option<Vec<u8>>
+    icc: Option<Vec<u8>>,
 }
 
 impl TestImage {
@@ -131,31 +131,37 @@ impl Hash for TestImage {
     }
 }
 
-
 impl CustomImage for TestImage {
     fn color_channel(&self) -> &[u8] {
-        self.actual_dynamic.get_or_init(|| {
-            let dynamic = self.original_dynamic.clone();
-            let channel_count = dynamic.color().channel_count();
-
-            match (dynamic.as_ref(), channel_count) {
-                (DynamicImage::ImageLuma8(_), _) => dynamic.clone(),
-                (DynamicImage::ImageRgb8(_), _) => dynamic.clone(),
-                (_, 1 | 2) => Arc::new(DynamicImage::ImageLuma8(dynamic.to_luma8())),
-                _ => Arc::new(DynamicImage::ImageRgb8(dynamic.to_rgb8())),
-            }
-        }).as_bytes()
+        self.actual_dynamic
+            .get_or_init(|| {
+                let dynamic = self.original_dynamic.clone();
+                let channel_count = dynamic.color().channel_count();
+
+                match (dynamic.as_ref(), channel_count) {
+                    (DynamicImage::ImageLuma8(_), _) => dynamic.clone(),
+                    (DynamicImage::ImageRgb8(_), _) => dynamic.clone(),
+                    (_, 1 | 2) => Arc::new(DynamicImage::ImageLuma8(dynamic.to_luma8())),
+                    _ => Arc::new(DynamicImage::ImageRgb8(dynamic.to_rgb8())),
+                }
+            })
+            .as_bytes()
     }
 
     fn alpha_channel(&self) -> Option<&[u8]> {
-        self.alpha_channel.get_or_init(||
-            self.original_dynamic.color().has_alpha()
-                .then(|| Arc::new(self.original_dynamic
-                    .pixels()
-                    .map(|(_, _, Rgba([_, _, _, a]))| a)
-                    .collect())
-                )
-        ).as_ref().map(|v| &***v)
+        self.alpha_channel
+            .get_or_init(|| {
+                self.original_dynamic.color().has_alpha().then(|| {
+                    Arc::new(
+                        self.original_dynamic
+                            .pixels()
+                            .map(|(_, _, Rgba([_, _, _, a]))| a)
+                            .collect(),
+                    )
+                })
+            })
+            .as_ref()
+            .map(|v| &***v)
     }
 
     fn bits_per_component(&self) -> BitsPerComponent {
@@ -173,7 +179,7 @@ impl CustomImage for TestImage {
     fn color_space(&self) -> ImageColorspace {
         if self.original_dynamic.color().has_color() {
             ImageColorspace::Rgb
-        }   else {
+        } else {
             ImageColorspace::Luma
         }
     }
@@ -298,13 +304,19 @@ pub fn load_webp_image(name: &str) -> Image {
 }
 
 pub fn load_custom_image(name: &str) -> Image {
-    Image::from_custom(TestImage::new(std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap(), None))
-        .unwrap()
+    Image::from_custom(TestImage::new(
+        std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap(),
+        None,
+    ))
+    .unwrap()
 }
 
 pub fn load_custom_image_with_icc(name: &str, icc: Vec<u8>) -> Image {
-    Image::from_custom(TestImage::new(std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap(), Some(icc)))
-        .unwrap()
+    Image::from_custom(TestImage::new(
+        std::fs::read(ASSETS_PATH.join("images").join(name)).unwrap(),
+        Some(icc),
+    ))
+    .unwrap()
 }
 
 fn write_snapshot_to_store(name: &str, content: &[u8]) {