fix clippy warnings

compositor/src/render/capture.rs

@@ -104,11 +104,10 @@ pub(crate) fn capture_window_frame(
         pixel.swap(0, 2);
         let alpha = pixel[3] as u16;
         for channel in &mut pixel[..3] {
-            *channel = if alpha == 0 {
-                0
-            } else {
-                ((*channel as u16 * 255 + alpha / 2) / alpha).min(255) as u8
-            };
+            *channel = (*channel as u16 * 255 + alpha / 2)
+                .checked_div(alpha)
+                .unwrap_or(0)
+                .min(255) as u8;
         }
     }
     Ok(crate::handlers::screenshot::CaptureBuffer {

compositor/src/render/materials.rs

@@ -37,7 +37,19 @@ pub(super) fn append_material_surface(
         .iter()
         .enumerate()
         .filter_map(|(index, (rect, radius))| {
-            material_element(state, renderer, output, surface, *rect, *radius, index, geometry, 1.0)
+            material_element(
+                state,
+                renderer,
+                output,
+                surface,
+                MaterialSurface {
+                    geometry: *rect,
+                    radius: *radius,
+                    index,
+                    capture_geometry: geometry,
+                    alpha: 1.0,
+                },
+            )
         })
         .collect();
     if let Some(buffers) = state.material_buffers.get_mut(surface) {
@@ -89,17 +101,28 @@ pub(super) fn append_material_surface(
     }
 }
 
+pub(super) struct MaterialSurface {
+    pub geometry: Rectangle<i32, Logical>,
+    pub radius: f32,
+    pub index: usize,
+    pub capture_geometry: Rectangle<i32, Logical>,
+    pub alpha: f32,
+}
+
 pub(super) fn material_element(
     state: &mut Ferese,
     renderer: &mut GlesRenderer,
     output: &Output,
     surface: &smithay::reexports::wayland_server::protocol::wl_surface::WlSurface,
-    geometry: Rectangle<i32, Logical>,
-    radius: f32,
-    index: usize,
-    capture_geometry: Rectangle<i32, Logical>,
-    alpha: f32,
+    surface_geometry: MaterialSurface,
 ) -> Option<(AnimatedWindowRenderElement, AnimatedWindowRenderElement)> {
+    let MaterialSurface {
+        geometry,
+        radius,
+        index,
+        capture_geometry,
+        alpha,
+    } = surface_geometry;
     let (role, generation) = crate::effects::surface_role(surface)?;
     let material = crate::effects::resolve_material(
         role,

compositor/src/render/mod.rs

@@ -527,7 +527,7 @@ mod tests {
             .unwrap();
         let size = (32, 32).into();
         let mut pixels = vec![128u8; 32 * 32 * 4];
-        for pixel in pixels.chunks_exact_mut(4) {
+        for pixel in pixels.as_chunks_mut::<4>().0 {
             pixel[3] = 255;
         }
         let blurred = renderer.import_memory(&pixels, Fourcc::Abgr8888, size, false).unwrap();

compositor/src/render/scene.rs

@@ -306,11 +306,13 @@ pub(crate) fn output_elements(
                     renderer,
                     output,
                     surface,
-                    constrain,
-                    window_radius as f32,
-                    0,
-                    constrain,
-                    close_alpha,
+                    MaterialSurface {
+                        geometry: constrain,
+                        radius: window_radius as f32,
+                        index: 0,
+                        capture_geometry: constrain,
+                        alpha: close_alpha,
+                    },
                 )
             {
                 elements.push(background);