From bba87e7ccf8a881fa3ff5ee9fe8a1a310ccd9197 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 20 Feb 2023 15:28:14 +0100 Subject: [PATCH] Inline variables --- .../src/algorithms/intersect/curve_face.rs | 4 +-- .../src/algorithms/intersect/face_point.rs | 32 +++++-------------- .../src/algorithms/intersect/ray_face.rs | 28 ++++------------ .../src/algorithms/triangulate/mod.rs | 4 +-- crates/fj-kernel/src/validate/face.rs | 8 ++--- 5 files changed, 19 insertions(+), 57 deletions(-) diff --git a/crates/fj-kernel/src/algorithms/intersect/curve_face.rs b/crates/fj-kernel/src/algorithms/intersect/curve_face.rs index 92677c73e..386ec6de7 100644 --- a/crates/fj-kernel/src/algorithms/intersect/curve_face.rs +++ b/crates/fj-kernel/src/algorithms/intersect/curve_face.rs @@ -161,8 +161,6 @@ mod tests { fn compute() { let mut services = Services::new(); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut curve = PartialCurve::default(); curve.update_as_line_from_points([[-3., 0.], [-2., 0.]]); let curve = curve.build(&mut services.objects); @@ -184,7 +182,7 @@ mod tests { let face = { let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior diff --git a/crates/fj-kernel/src/algorithms/intersect/face_point.rs b/crates/fj-kernel/src/algorithms/intersect/face_point.rs index f5c94620e..1f13c0a8e 100644 --- a/crates/fj-kernel/src/algorithms/intersect/face_point.rs +++ b/crates/fj-kernel/src/algorithms/intersect/face_point.rs @@ -148,10 +148,8 @@ mod tests { fn point_is_outside_face() { let mut services = Services::new(); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -172,10 +170,8 @@ mod tests { fn ray_hits_vertex_while_passing_outside() { let mut services = Services::new(); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -199,10 +195,8 @@ mod tests { fn ray_hits_vertex_at_cycle_seam() { let mut services = Services::new(); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -226,10 +220,8 @@ mod tests { fn ray_hits_vertex_while_staying_inside() { let mut services = Services::new(); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -254,10 +246,8 @@ mod tests { fn ray_hits_parallel_edge_and_leaves_face_at_vertex() { let mut services = Services::new(); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -282,10 +272,8 @@ mod tests { fn ray_hits_parallel_edge_and_does_not_leave_face_there() { let mut services = Services::new(); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -311,10 +299,8 @@ mod tests { fn point_is_coincident_with_edge() { let mut services = Services::new(); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -347,10 +333,8 @@ mod tests { fn point_is_coincident_with_vertex() { let mut services = Services::new(); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ diff --git a/crates/fj-kernel/src/algorithms/intersect/ray_face.rs b/crates/fj-kernel/src/algorithms/intersect/ray_face.rs index 2cfc93d03..4d90f15c3 100644 --- a/crates/fj-kernel/src/algorithms/intersect/ray_face.rs +++ b/crates/fj-kernel/src/algorithms/intersect/ray_face.rs @@ -163,10 +163,8 @@ mod tests { let ray = HorizontalRayToTheRight::from([0., 0., 0.]); - let surface = Partial::from(services.objects.surfaces.yz_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.yz_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -189,10 +187,8 @@ mod tests { let ray = HorizontalRayToTheRight::from([0., 0., 0.]); - let surface = Partial::from(services.objects.surfaces.yz_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.yz_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -218,10 +214,8 @@ mod tests { let ray = HorizontalRayToTheRight::from([0., 0., 0.]); - let surface = Partial::from(services.objects.surfaces.yz_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.yz_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -244,10 +238,8 @@ mod tests { let ray = HorizontalRayToTheRight::from([0., 0., 0.]); - let surface = Partial::from(services.objects.surfaces.yz_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.yz_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -281,10 +273,8 @@ mod tests { let ray = HorizontalRayToTheRight::from([0., 0., 0.]); - let surface = Partial::from(services.objects.surfaces.yz_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.yz_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -318,10 +308,8 @@ mod tests { let ray = HorizontalRayToTheRight::from([0., 0., 0.]); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -346,10 +334,8 @@ mod tests { let ray = HorizontalRayToTheRight::from([0., 0., 0.]); - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ diff --git a/crates/fj-kernel/src/algorithms/triangulate/mod.rs b/crates/fj-kernel/src/algorithms/triangulate/mod.rs index 41b17b606..d2a8ddc97 100644 --- a/crates/fj-kernel/src/algorithms/triangulate/mod.rs +++ b/crates/fj-kernel/src/algorithms/triangulate/mod.rs @@ -96,10 +96,8 @@ mod tests { let c = [2., 2.]; let d = [0., 1.]; - let surface = Partial::from(services.objects.surfaces.xy_plane()); - let mut face = PartialFace { - surface, + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior diff --git a/crates/fj-kernel/src/validate/face.rs b/crates/fj-kernel/src/validate/face.rs index 883d9d6c5..3bbd360e5 100644 --- a/crates/fj-kernel/src/validate/face.rs +++ b/crates/fj-kernel/src/validate/face.rs @@ -161,10 +161,8 @@ mod tests { let mut services = Services::new(); let valid = { - let surface = services.objects.surfaces.xy_plane(); - let mut face = PartialFace { - surface: Partial::from(surface), + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([ @@ -212,10 +210,8 @@ mod tests { let mut services = Services::new(); let valid = { - let surface = services.objects.surfaces.xy_plane(); - let mut face = PartialFace { - surface: Partial::from(surface), + surface: Partial::from(services.objects.surfaces.xy_plane()), ..Default::default() }; face.exterior.write().update_as_polygon_from_points([