Clean up fj-interop crate

crates/fj-core/src/algorithms/approx/face.rs

@@ -4,7 +4,7 @@
 
 use std::{collections::BTreeSet, ops::Deref};
 
-use fj_interop::mesh::Color;
+use fj_interop::Color;
 
 use crate::{
     objects::{Face, Handedness, ObjectSet},

crates/fj-core/src/algorithms/triangulate/mod.rs

@@ -3,7 +3,7 @@
 mod delaunay;
 mod polygon;
 
-use fj_interop::mesh::Mesh;
+use fj_interop::Mesh;
 use fj_math::Point;
 
 use self::polygon::Polygon;
@@ -74,7 +74,7 @@ impl Triangulate for FaceApprox {
 
 #[cfg(test)]
 mod tests {
-    use fj_interop::mesh::Mesh;
+    use fj_interop::Mesh;
     use fj_math::{Point, Scalar};
 
     use crate::{

crates/fj-core/src/objects/kinds/region.rs

@@ -1,5 +1,6 @@
 //! A single, continues 2d region
-use fj_interop::mesh::Color;
+
+use fj_interop::Color;
 
 use crate::{
     objects::{Cycle, ObjectSet},

crates/fj-core/src/operations/sweep/cycle.rs

@@ -1,4 +1,4 @@
-use fj_interop::mesh::Color;
+use fj_interop::Color;
 use fj_math::Vector;
 
 use crate::{

crates/fj-core/src/operations/sweep/half_edge.rs

@@ -1,4 +1,4 @@
-use fj_interop::{ext::ArrayExt, mesh::Color};
+use fj_interop::{ext::ArrayExt, Color};
 use fj_math::{Point, Scalar, Vector};
 
 use crate::{

crates/fj-core/src/operations/sweep/region.rs

@@ -1,4 +1,4 @@
-use fj_interop::mesh::Color;
+use fj_interop::Color;
 use fj_math::Vector;
 
 use crate::{

crates/fj-export/src/lib.rs

@@ -12,7 +12,7 @@ use std::{fs::File, path::Path};
 
 use thiserror::Error;
 
-use fj_interop::mesh::Mesh;
+use fj_interop::Mesh;
 use fj_math::{Point, Triangle};
 
 /// Export the provided mesh to the file at the given path.

crates/fj-interop/src/lib.rs

@@ -9,6 +9,12 @@
 //!
 //! [Fornjot]: https://www.fornjot.app/
 
+mod mesh;
+mod model;
+
 pub mod ext;
-pub mod mesh;
-pub mod model;
+
+pub use self::{
+    mesh::{Color, Index, Mesh, Triangle},
+    model::Model,
+};

crates/fj-interop/src/mesh.rs

@@ -1,5 +1,3 @@
-//! A triangle mesh
-
 use std::{collections::HashMap, hash::Hash};
 
 use fj_math::Point;

crates/fj-interop/src/model.rs

@@ -1,5 +1,3 @@
-//! An approximated model
-
 use fj_math::{Aabb, Point};
 
 use crate::mesh::Mesh;

crates/fj-viewer/src/camera.rs

@@ -1,7 +1,7 @@
 //! Viewer camera module
 use std::f64::consts::FRAC_PI_2;
 
-use fj_interop::{mesh::Mesh, model::Model};
+use fj_interop::{Mesh, Model};
 use fj_math::{Aabb, Point, Scalar, Transform, Vector};
 
 use crate::screen::NormalizedScreenPosition;

crates/fj-viewer/src/graphics/vertices.rs

@@ -1,5 +1,5 @@
 use bytemuck::{Pod, Zeroable};
-use fj_interop::mesh::{Index, Mesh};
+use fj_interop::{Index, Mesh};
 
 #[derive(Debug)]
 pub struct Vertices {

crates/fj-viewer/src/viewer.rs

@@ -1,4 +1,4 @@
-use fj_interop::model::Model;
+use fj_interop::Model;
 use tracing::warn;
 
 use crate::{

crates/fj-window/src/display.rs

@@ -1,4 +1,4 @@
-use fj_interop::model::Model;
+use fj_interop::Model;
 use fj_viewer::{
     InputEvent, NormalizedScreenPosition, RendererInitError, Screen,
     ScreenSize, Viewer,

crates/fj/src/handle_model.rs

@@ -9,7 +9,7 @@ use fj_core::{
     services::Services,
     validate::ValidationErrors,
 };
-use fj_interop::model::Model;
+use fj_interop::Model;
 use fj_math::{Aabb, Point, Scalar};
 use tracing_subscriber::prelude::*;