Merge pull request #1480 from hannobraun/iter

Remove `fj_kernel::iter`
hannobraun · Jan 4, 2023 · b9a5e2f · b9a5e2f
2 parents ea6747a + 096b077
commit b9a5e2f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 663 deletions.
diff --git a/crates/fj-kernel/src/algorithms/intersect/face_point.rs b/crates/fj-kernel/src/algorithms/intersect/face_point.rs
@@ -138,7 +138,6 @@ mod tests {
         algorithms::intersect::{face_point::FacePointIntersection, Intersect},
         builder::FaceBuilder,
         insert::Insert,
-        iter::ObjectIters,
         partial::{Partial, PartialFace, PartialObject},
         services::Services,
     };
@@ -292,7 +291,8 @@ mod tests {
         let intersection = (&face, &point).intersect();
 
         let edge = face
-            .half_edge_iter()
+            .exterior()
+            .half_edges()
             .find(|edge| {
                 let [a, b] = edge.vertices();
                 a.global_form().position() == Point::from([0., 0., 0.])
@@ -321,7 +321,9 @@ mod tests {
         let intersection = (&face, &point).intersect();
 
         let vertex = face
-            .vertex_iter()
+            .exterior()
+            .half_edges()
+            .flat_map(|half_edge| half_edge.vertices())
             .find(|vertex| {
                 vertex.global_form().position() == Point::from([1., 0., 0.])
             })

diff --git a/crates/fj-kernel/src/algorithms/intersect/ray_face.rs b/crates/fj-kernel/src/algorithms/intersect/ray_face.rs
@@ -154,7 +154,6 @@ mod tests {
         },
         builder::FaceBuilder,
         insert::Insert,
-        iter::ObjectIters,
         partial::{Partial, PartialFace, PartialObject},
         services::Services,
     };
@@ -252,7 +251,8 @@ mod tests {
             .translate([1., 1., 0.], &mut services.objects);
 
         let edge = face
-            .half_edge_iter()
+            .exterior()
+            .half_edges()
             .find(|edge| {
                 let [a, b] = edge.vertices();
                 a.global_form().position() == Point::from([1., 0., 1.])
@@ -286,7 +286,9 @@ mod tests {
             .translate([1., 1., 1.], &mut services.objects);
 
         let vertex = face
-            .vertex_iter()
+            .exterior()
+            .half_edges()
+            .flat_map(|half_edge| half_edge.vertices())
             .find(|vertex| {
                 vertex.global_form().position() == Point::from([1., 0., 0.])
             })