Fix some clippy lints

Author: LaurenzV

examples/scenes/src/pico_svg.rs

@@ -172,8 +172,8 @@ impl Parser {
                             path: path.clone(),
                         }));
                     }
-                    if let Some(stroke_color) = node.attribute("stroke") {
-                        if stroke_color != "none" {
+                    if let Some(stroke_color) = node.attribute("stroke")
+                        && stroke_color != "none" {
                             let width = node
                                 .attribute("stroke-width")
                                 .map(|a| f64::from_str(a).unwrap_or(1.0))
@@ -185,7 +185,6 @@ impl Parser {
                             let color = modify_opacity(color, "opacity", node);
                             items.push(Item::Stroke(StrokeItem { width, color, path }));
                         }
-                    }
                 }
                 other => eprintln!("Unhandled node type {other}"),
             }

examples/scenes/src/svg.rs

@@ -39,11 +39,10 @@ fn scene_from_files_inner(files: &[PathBuf]) -> std::result::Result<SceneSet, an
             let start_index = scenes.len();
             for file in read_dir(path)? {
                 let entry = file?;
-                if let Some(extension) = Path::new(&entry.file_name()).extension() {
-                    if extension == "svg" {
+                if let Some(extension) = Path::new(&entry.file_name()).extension()
+                    && extension == "svg" {
                         scenes.push(example_scene_of(entry.path()));
                     }
-                }
             }
             // Ensure a consistent order within directories
             scenes[start_index..].sort_by_key(|scene| scene.config.name.to_lowercase());

examples/with_winit/src/lib.rs

@@ -411,8 +411,7 @@ impl ApplicationHandler<UserEvent> for VelloApp {
                             valid_surface,
                             ..
                         }) = &self.state
-                        {
-                            if *valid_surface
+                            && *valid_surface
                                 && touch.location.y > surface.config.height as f64 * 2. / 3.
                             {
                                 self.navigation_fingers.insert(touch.id);
@@ -423,7 +422,6 @@ impl ApplicationHandler<UserEvent> for VelloApp {
                                     self.scene_ix = self.scene_ix.saturating_add(1);
                                 }
                             }
-                        }
                     }
                     TouchPhase::Ended | TouchPhase::Cancelled => {
                         // We intentionally ignore the result here
@@ -485,11 +483,10 @@ impl ApplicationHandler<UserEvent> for VelloApp {
                     x: position.x,
                     y: position.y,
                 };
-                if self.mouse_down {
-                    if let Some(prior) = self.prior_position {
+                if self.mouse_down
+                    && let Some(prior) = self.prior_position {
                         self.transform = self.transform.then_translate(position - prior);
                     }
-                }
                 self.prior_position = Some(position);
             }
             WindowEvent::RedrawRequested => {
@@ -578,14 +575,12 @@ impl ApplicationHandler<UserEvent> for VelloApp {
                     if let Some(profiling_result) = self.renderers[surface.dev_id]
                         .as_mut()
                         .and_then(|renderer| renderer.profile_result.take())
-                    {
-                        if self.profile_stored.is_none()
-                            || self.profile_taken.elapsed() > Duration::from_secs(1)
+                        && (self.profile_stored.is_none()
+                            || self.profile_taken.elapsed() > Duration::from_secs(1))
                         {
                             self.profile_stored = Some(profiling_result);
                             self.profile_taken = Instant::now();
                         }
-                    }
                     #[cfg(feature = "wgpu-profiler")]
                     if let Some(profiling_result) = self.profile_stored.as_ref() {
                         stats::draw_gpu_profiling(

sparse_strips/vello_common/src/clip.rs

@@ -19,11 +19,11 @@ struct ClipData {
 impl ClipData {
     fn to_path_data_ref<'a>(&self, storage: &'a StripStorage) -> PathDataRef<'a> {
         PathDataRef {
-            strips: &storage
+            strips: storage
                 .strips
                 .get(self.strip_start as usize..)
                 .unwrap_or(&[]),
-            alphas: &storage
+            alphas: storage
                 .alphas
                 .get(self.alpha_start as usize..)
                 .unwrap_or(&[]),
@@ -39,6 +39,12 @@ pub struct ClipContext {
     clip_stack: Vec<ClipData>,
 }
 
+impl Default for ClipContext {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl ClipContext {
     /// Create a new clip context.
     #[inline]

sparse_strips/vello_common/src/strip_generator.rs

@@ -51,7 +51,7 @@ impl StripStorage {
     }
 
     /// Extend the current strip storage with the data from another storage.
-    pub fn extend(&mut self, other: &StripStorage) {
+    pub fn extend(&mut self, other: &Self) {
         self.strips.extend(&other.strips);
         self.alphas.extend(&other.alphas);
     }
@@ -101,7 +101,7 @@ impl StripGenerator {
             &mut self.flatten_ctx,
         );
 
-        self.generate_with_clip(aliasing_threshold, strip_storage, fill_rule, clip_path)
+        self.generate_with_clip(aliasing_threshold, strip_storage, fill_rule, clip_path);
     }
 
     /// Generate the strips for a stroked path.
@@ -122,7 +122,7 @@ impl StripGenerator {
             &mut self.line_buf,
             &mut self.flatten_ctx,
         );
-        self.generate_with_clip(aliasing_threshold, strip_storage, Fill::NonZero, clip_path)
+        self.generate_with_clip(aliasing_threshold, strip_storage, Fill::NonZero, clip_path);
     }
 
     fn generate_with_clip(

sparse_strips/vello_cpu/src/dispatch/single_threaded.rs

@@ -215,7 +215,7 @@ impl Dispatcher for SingleThreadedDispatcher {
             fill_rule,
             transform,
             aliasing_threshold,
-        )
+        );
     }
 
     fn pop_clip_path(&mut self) {

sparse_strips/vello_cpu/src/render.rs

@@ -428,7 +428,7 @@ impl RenderContext {
             self.fill_rule,
             self.transform,
             self.aliasing_threshold,
-        )
+        );
     }
 
     /// Pop a clip path from the clip stack.

sparse_strips/vello_hybrid/examples/winit/src/main.rs

@@ -203,11 +203,10 @@ impl ApplicationHandler for App<'_> {
                     event_loop.exit();
                 }
                 Key::Character(ch) => {
-                    if let Some(scene) = self.scenes.get_mut(self.current_scene) {
-                        if scene.handle_key(ch.as_str()) {
+                    if let Some(scene) = self.scenes.get_mut(self.current_scene)
+                        && scene.handle_key(ch.as_str()) {
                             window.request_redraw();
                         }
-                    }
                 }
                 _ => {}
             },