From bae1e8f48a2a5b823d5cc11a6de46c7a941d06af Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Tue, 15 Sep 2026 22:15:51 +0200 Subject: [PATCH] Fix the remaining clippy warnings across the workspace --- .../portfolio/document/graph_operation/utility_types.rs | 4 ++-- node-graph/nodes/math/src/lib.rs | 3 +-- node-graph/nodes/path-bool/src/lib.rs | 2 +- node-graph/nodes/vector/src/vector_nodes.rs | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs index 0e1d107582..4e99838a0a 100644 --- a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs +++ b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs @@ -645,7 +645,7 @@ impl<'a> ModifyInputsContext<'a> { .nodes .get(&node_id) .and_then(|node| node.input(graphene_std::math_nodes::gradient_positions::PositionsInput)); - if !current_input.is_some_and(|input| input.as_value().is_some()) { + if current_input.is_none_or(|input| input.as_value().is_none()) { return; } @@ -669,7 +669,7 @@ impl<'a> ModifyInputsContext<'a> { .nodes .get(&node_id) .and_then(|node| node.input(graphene_std::math_nodes::gradient_midpoints::MidpointsInput)); - if !current_input.is_some_and(|input| input.as_value().is_some()) { + if current_input.is_none_or(|input| input.as_value().is_none()) { return; } diff --git a/node-graph/nodes/math/src/lib.rs b/node-graph/nodes/math/src/lib.rs index 18521d4c23..1a753c545e 100644 --- a/node-graph/nodes/math/src/lib.rs +++ b/node-graph/nodes/math/src/lib.rs @@ -992,9 +992,8 @@ pub fn sum(_: impl Ctx, values: IList) -> f64 { #[node_macro::node(category("Math: Numeric"))] fn average(_: impl Ctx, values: IList) -> f64 { let count = values.len(); - let average = if count == 0 { 0. } else { values.iter().sum::() / count as f64 }; - average + if count == 0 { 0. } else { values.iter().sum::() / count as f64 } } /// Gives the smallest number in the input list. An empty list gives 0. diff --git a/node-graph/nodes/path-bool/src/lib.rs b/node-graph/nodes/path-bool/src/lib.rs index 7d2fa735ff..303f4dd5c4 100644 --- a/node-graph/nodes/path-bool/src/lib.rs +++ b/node-graph/nodes/path-bool/src/lib.rs @@ -334,7 +334,7 @@ fn stamp_inherited_appearance(out: &mut List, index: usize, inherited: O fn push_union(out: &mut List, flattened: List) { // The union emits one blank operand even from an empty list, which would fabricate a region out of nothing - if flattened.len() == 0 { + if flattened.is_empty() { return; } for row in boolean_operation_on_vector_list(&flattened, BooleanOperation::Union).into_iter() { diff --git a/node-graph/nodes/vector/src/vector_nodes.rs b/node-graph/nodes/vector/src/vector_nodes.rs index 4434a56a31..5638e7861c 100644 --- a/node-graph/nodes/vector/src/vector_nodes.rs +++ b/node-graph/nodes/vector/src/vector_nodes.rs @@ -4150,7 +4150,7 @@ mod test { fn voronoi_shared_mesh_has_no_regions() { let vector = with_ctx(|ctx| super::voronoi_cells(ctx, vector_from_points(&SQUARE_WITH_CENTER), true).unwrap()); assert_eq!(vector.region_domain.ids().len(), 0); - assert!(vector.segment_domain.ids().len() > 0); + assert!(!vector.segment_domain.ids().is_empty()); } #[test] @@ -4179,8 +4179,8 @@ mod test { assert_eq!(vector.point_domain.ids().len(), points.len()); assert_ne!(vector.point_domain.positions(), &points[..]); // The convex-hull corners are pinned. - for i in 0..4 { - assert_eq!(vector.point_domain.positions()[i], points[i], "hull corner {i} should be pinned"); + for (corner, &expected) in points.iter().enumerate().take(4) { + assert_eq!(vector.point_domain.positions()[corner], expected, "hull corner {corner} should be pinned"); } for &point in vector.point_domain.positions() { assert!(point.x >= -1e-6 && point.x <= 10. + 1e-6);