From 3928443331756cd5bbbd14fa6f2c263045100c52 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hello@hannobraun.com>
Date: Fri, 11 Oct 2024 18:53:36 +0200
Subject: [PATCH] Re-export `SweptCurve` from `surfaces`

---
 crates/fj-core/src/algorithms/approx/curve.rs         | 7 +++----
 crates/fj-core/src/algorithms/bounding_volume/face.rs | 5 ++---
 crates/fj-core/src/geometry/geometry.rs               | 4 ++--
 crates/fj-core/src/geometry/surfaces/mod.rs           | 2 ++
 crates/fj-core/src/geometry/util/tri_mesh.rs          | 2 +-
 crates/fj-core/src/layers/geometry.rs                 | 4 ++--
 crates/fj-core/src/operations/build/surface.rs        | 2 +-
 crates/fj-core/src/operations/sweep/path.rs           | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/crates/fj-core/src/algorithms/approx/curve.rs b/crates/fj-core/src/algorithms/approx/curve.rs
index 9e08dd964..51bc212c7 100644
--- a/crates/fj-core/src/algorithms/approx/curve.rs
+++ b/crates/fj-core/src/algorithms/approx/curve.rs
@@ -4,9 +4,8 @@ use fj_math::{Circle, Line, Point};
 
 use crate::{
     geometry::{
-        surfaces::swept_curve::SweptCurve,
-        util::tri_mesh::convert_point_surface_to_global, CurveBoundary,
-        Geometry, Path, Tolerance,
+        surfaces::SweptCurve, util::tri_mesh::convert_point_surface_to_global,
+        CurveBoundary, Geometry, Path, Tolerance,
     },
     storage::Handle,
     topology::{Curve, Surface},
@@ -205,7 +204,7 @@ mod tests {
             circle::approx_circle, curve::approx_curve, ApproxPoint,
         },
         geometry::{
-            surfaces::swept_curve::SweptCurve,
+            surfaces::SweptCurve,
             util::tri_mesh::convert_point_surface_to_global, CurveBoundary,
             Path,
         },
diff --git a/crates/fj-core/src/algorithms/bounding_volume/face.rs b/crates/fj-core/src/algorithms/bounding_volume/face.rs
index 445607b93..e4755ff4e 100644
--- a/crates/fj-core/src/algorithms/bounding_volume/face.rs
+++ b/crates/fj-core/src/algorithms/bounding_volume/face.rs
@@ -4,9 +4,8 @@ use fj_math::{Aabb, Vector};
 
 use crate::{
     geometry::{
-        surfaces::swept_curve::SweptCurve,
-        util::tri_mesh::convert_point_surface_to_global, Geometry, Path,
-        Tolerance,
+        surfaces::SweptCurve, util::tri_mesh::convert_point_surface_to_global,
+        Geometry, Path, Tolerance,
     },
     topology::Face,
 };
diff --git a/crates/fj-core/src/geometry/geometry.rs b/crates/fj-core/src/geometry/geometry.rs
index 505331009..ddfb82107 100644
--- a/crates/fj-core/src/geometry/geometry.rs
+++ b/crates/fj-core/src/geometry/geometry.rs
@@ -8,8 +8,8 @@ use crate::{
 };
 
 use super::{
-    surfaces::swept_curve::SweptCurve, vertex::LocalVertexGeom, CurveGeom,
-    CurveGeom2, LocalCurveGeom, Path, VertexGeom,
+    surfaces::SweptCurve, vertex::LocalVertexGeom, CurveGeom, CurveGeom2,
+    LocalCurveGeom, Path, VertexGeom,
 };
 
 /// Geometric data that is associated with topological objects
diff --git a/crates/fj-core/src/geometry/surfaces/mod.rs b/crates/fj-core/src/geometry/surfaces/mod.rs
index 956197234..94a8dfd94 100644
--- a/crates/fj-core/src/geometry/surfaces/mod.rs
+++ b/crates/fj-core/src/geometry/surfaces/mod.rs
@@ -1,3 +1,5 @@
 //! # Geometry code specific to various types of surfaces
 
 pub mod swept_curve;
+
+pub use self::swept_curve::SweptCurve;
diff --git a/crates/fj-core/src/geometry/util/tri_mesh.rs b/crates/fj-core/src/geometry/util/tri_mesh.rs
index ac8ccfc16..ec8b66a92 100644
--- a/crates/fj-core/src/geometry/util/tri_mesh.rs
+++ b/crates/fj-core/src/geometry/util/tri_mesh.rs
@@ -36,7 +36,7 @@ mod tests {
     use pretty_assertions::assert_eq;
 
     use crate::geometry::{
-        surfaces::swept_curve::SweptCurve,
+        surfaces::SweptCurve,
         util::tri_mesh::{
             convert_point_surface_to_global, convert_vector_surface_to_global,
         },
diff --git a/crates/fj-core/src/layers/geometry.rs b/crates/fj-core/src/layers/geometry.rs
index 0efec4370..7e0343aa5 100644
--- a/crates/fj-core/src/layers/geometry.rs
+++ b/crates/fj-core/src/layers/geometry.rs
@@ -2,8 +2,8 @@
 
 use crate::{
     geometry::{
-        surfaces::swept_curve::SweptCurve, CurveGeom2, Geometry,
-        LocalCurveGeom, LocalVertexGeom,
+        surfaces::SweptCurve, CurveGeom2, Geometry, LocalCurveGeom,
+        LocalVertexGeom,
     },
     storage::Handle,
     topology::{Curve, Surface, Vertex},
diff --git a/crates/fj-core/src/operations/build/surface.rs b/crates/fj-core/src/operations/build/surface.rs
index cf7b4a856..c96734457 100644
--- a/crates/fj-core/src/operations/build/surface.rs
+++ b/crates/fj-core/src/operations/build/surface.rs
@@ -1,7 +1,7 @@
 use fj_math::{Point, Scalar, Vector};
 
 use crate::{
-    geometry::{surfaces::swept_curve::SweptCurve, Path},
+    geometry::{surfaces::SweptCurve, Path},
     operations::insert::Insert,
     storage::Handle,
     topology::Surface,
diff --git a/crates/fj-core/src/operations/sweep/path.rs b/crates/fj-core/src/operations/sweep/path.rs
index 330f789a1..555dfe2dc 100644
--- a/crates/fj-core/src/operations/sweep/path.rs
+++ b/crates/fj-core/src/operations/sweep/path.rs
@@ -2,7 +2,7 @@ use fj_math::{Circle, Line, Vector};
 
 use crate::{
     geometry::{
-        surfaces::swept_curve::SweptCurve,
+        surfaces::SweptCurve,
         util::tri_mesh::{
             convert_point_surface_to_global, convert_vector_surface_to_global,
         },