From 1d64b5afbcf5dd7006b5ca07561cf502dea6a900 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 20 Feb 2023 15:32:16 +0100 Subject: [PATCH] Simplify `PartialCycle` construction --- crates/fj-kernel/src/algorithms/sweep/edge.rs | 4 +--- crates/fj-kernel/src/validate/cycle.rs | 8 ++------ crates/fj-kernel/src/validate/face.rs | 4 +--- crates/fj-operations/src/sketch.rs | 8 ++------ 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/crates/fj-kernel/src/algorithms/sweep/edge.rs b/crates/fj-kernel/src/algorithms/sweep/edge.rs index a82c1a4f3..4f539b11b 100644 --- a/crates/fj-kernel/src/algorithms/sweep/edge.rs +++ b/crates/fj-kernel/src/algorithms/sweep/edge.rs @@ -268,9 +268,7 @@ mod tests { .clone() }; - let mut cycle = PartialCycle { - ..Default::default() - }; + let mut cycle = PartialCycle::default(); cycle.half_edges.extend( [bottom, side_up, top, side_down].map(Partial::from_partial), ); diff --git a/crates/fj-kernel/src/validate/cycle.rs b/crates/fj-kernel/src/validate/cycle.rs index 5d7c3c76d..d8898820d 100644 --- a/crates/fj-kernel/src/validate/cycle.rs +++ b/crates/fj-kernel/src/validate/cycle.rs @@ -147,9 +147,7 @@ mod tests { let valid = { let surface = services.objects.surfaces.xy_plane(); - let mut cycle = PartialCycle { - ..Default::default() - }; + let mut cycle = PartialCycle::default(); cycle.update_as_polygon_from_points([[0., 0.], [1., 0.], [0., 1.]]); cycle.infer_vertex_positions_if_necessary(&surface.geometry()); cycle.build(&mut services.objects) @@ -190,9 +188,7 @@ mod tests { let valid = { let surface = services.objects.surfaces.xy_plane(); - let mut cycle = PartialCycle { - ..Default::default() - }; + let mut cycle = PartialCycle::default(); cycle.update_as_polygon_from_points([[0., 0.], [1., 0.], [0., 1.]]); cycle.infer_vertex_positions_if_necessary(&surface.geometry()); cycle.build(&mut services.objects) diff --git a/crates/fj-kernel/src/validate/face.rs b/crates/fj-kernel/src/validate/face.rs index 3bbd360e5..6fde9dfb9 100644 --- a/crates/fj-kernel/src/validate/face.rs +++ b/crates/fj-kernel/src/validate/face.rs @@ -181,9 +181,7 @@ mod tests { let invalid = { let surface = services.objects.surfaces.xz_plane(); - let mut cycle = PartialCycle { - ..Default::default() - }; + let mut cycle = PartialCycle::default(); cycle.update_as_polygon_from_points([[1., 1.], [1., 2.], [2., 1.]]); cycle.infer_vertex_positions_if_necessary(&surface.geometry()); let cycle = cycle diff --git a/crates/fj-operations/src/sketch.rs b/crates/fj-operations/src/sketch.rs index 1e223a917..f6a463e6b 100644 --- a/crates/fj-operations/src/sketch.rs +++ b/crates/fj-operations/src/sketch.rs @@ -36,9 +36,7 @@ impl Shape for fj::Sketch { Partial::from_partial(half_edge) }; let exterior = { - let mut cycle = PartialCycle { - ..Default::default() - }; + let mut cycle = PartialCycle::default(); cycle.half_edges.push(half_edge); Partial::from_partial(cycle) }; @@ -58,9 +56,7 @@ impl Shape for fj::Sketch { ); let exterior = { - let mut cycle = PartialCycle { - ..Default::default() - }; + let mut cycle = PartialCycle::default(); let mut line_segments = vec![]; let mut arcs = vec![]; poly_chain.to_segments().into_iter().for_each(