Merge pull request #454 from hannobraun/interop

Rename `fj-debug` crate to `fj-interop`

Cargo.lock

@@ -668,8 +668,8 @@ dependencies = [
  "clap",
  "figment",
  "fj",
- "fj-debug",
  "fj-host",
+ "fj-interop",
  "fj-kernel",
  "fj-math",
  "fj-operations",
@@ -686,13 +686,6 @@ dependencies = [
  "winit",
 ]
 
-[[package]]
-name = "fj-debug"
-version = "0.5.0"
-dependencies = [
- "fj-math",
-]
-
 [[package]]
 name = "fj-host"
 version = "0.5.0"
@@ -703,6 +696,13 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "fj-interop"
+version = "0.5.0"
+dependencies = [
+ "fj-math",
+]
+
 [[package]]
 name = "fj-kernel"
 version = "0.5.0"
@@ -710,7 +710,7 @@ dependencies = [
  "anyhow",
  "anymap",
  "approx 0.5.1",
- "fj-debug",
+ "fj-interop",
  "fj-math",
  "map-macro",
  "nalgebra",
@@ -740,7 +740,7 @@ name = "fj-operations"
 version = "0.5.0"
 dependencies = [
  "fj",
- "fj-debug",
+ "fj-interop",
  "fj-kernel",
  "fj-math",
  "nalgebra",

Cargo.toml

@@ -3,8 +3,8 @@ resolver = "2"
 members = [
     "fj",
     "fj-app",
-    "fj-debug",
     "fj-host",
+    "fj-interop",
     "fj-kernel",
     "fj-math",
     "fj-operations",
@@ -18,8 +18,8 @@ members = [
 ]
 default-members = [
     "fj-app",
-    "fj-debug",
     "fj-host",
+    "fj-interop",
     "fj-kernel",
     "fj-math",
     "fj-operations",

fj-app/Cargo.toml

@@ -36,14 +36,14 @@ features = ["env", "toml"]
 version = "0.5.0"
 path = "../fj"
 
-[dependencies.fj-debug]
-version = "0.5.0"
-path    = "../fj-debug"
-
 [dependencies.fj-host]
 version = "0.5.0"
 path = "../fj-host"
 
+[dependencies.fj-interop]
+version = "0.5.0"
+path = "../fj-interop"
+
 [dependencies.fj-kernel]
 version = "0.5.0"
 path = "../fj-kernel"

fj-app/src/graphics/vertices.rs

@@ -1,5 +1,5 @@
 use bytemuck::{Pod, Zeroable};
-use fj_debug::DebugInfo;
+use fj_interop::debug::DebugInfo;
 use fj_math::Triangle;
 use nalgebra::{vector, Point};
 

fj-app/src/main.rs

@@ -9,8 +9,8 @@ mod window;
 use std::path::PathBuf;
 use std::{collections::HashMap, time::Instant};
 
-use fj_debug::DebugInfo;
 use fj_host::Model;
+use fj_interop::debug::DebugInfo;
 use fj_kernel::algorithms::triangulate;
 use fj_math::{Aabb, Scalar, Triangle};
 use fj_operations::ToShape as _;

fj-debug/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name    = "fj-debug"
-version = "0.5.0"
-edition = "2021"
-
-description = "The world needs another CAD program."
-readme      = "../README.md"
-repository  = "https://github.com/hannobraun/fornjot"
-license     = "0BSD"
-keywords    = ["cad", "programmatic", "code-cad"]
-
-
-[dependencies.fj-math]
-path    = "../fj-math"
-version = "0.5.0"

fj-interop/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "fj-interop"
+version = "0.5.0"
+edition = "2021"
+
+description = "The world needs another CAD program."
+readme = "../README.md"
+repository = "https://github.com/hannobraun/fornjot"
+license = "0BSD"
+keywords = ["cad", "programmatic", "code-cad"]
+
+
+[dependencies.fj-math]
+path = "../fj-math"
+version = "0.5.0"

fj-interop/src/debug.rs

@@ -1,11 +1,8 @@
 //! Debug information definitions for the Fornjot ecosystem
 //!
-//! This crate contains debug information that is used by other crates within
-//! the Fornjot ecosystem. The types in here aren't very useful in themselves,
-//! but they define an interface that other crates use to communicate between
-//! each other.
-
-#![deny(missing_docs)]
+//! Defines debug information that is used by other crates within the Fornjot
+//! ecosystem. The types in here aren't very useful in themselves, but they
+//! define an interface that other crates use to communicate between each other.
 
 use fj_math::{Point, Segment};
 

fj-interop/src/lib.rs

@@ -0,0 +1,5 @@
+//! Data types for interoperation within the Fornjot ecosystem
+
+#![deny(missing_docs)]
+
+pub mod debug;

fj-kernel/Cargo.toml

@@ -25,9 +25,9 @@ slotmap     = "1.0.6"
 spade = "2.0.0"
 thiserror = "1.0.30"
 
-[dependencies.fj-debug]
+[dependencies.fj-interop]
 version = "0.5.0"
-path    = "../fj-debug"
+path = "../fj-interop"
 
 [dependencies.fj-math]
 version = "0.5.0"

fj-kernel/src/algorithms/triangulation/mod.rs

@@ -1,7 +1,7 @@
 mod polygon;
 mod ray;
 
-use fj_debug::DebugInfo;
+use fj_interop::debug::DebugInfo;
 use fj_math::{Scalar, Triangle};
 use parry2d_f64::utils::point_in_triangle::{corner_direction, Orientation};
 use spade::HasPosition;
@@ -121,7 +121,7 @@ impl HasPosition for geometry::Point<2> {
 
 #[cfg(test)]
 mod tests {
-    use fj_debug::DebugInfo;
+    use fj_interop::debug::DebugInfo;
     use fj_math::{Scalar, Triangle};
 
     use crate::{geometry::Surface, shape::Shape, topology::Face};

fj-kernel/src/algorithms/triangulation/polygon.rs

@@ -1,4 +1,4 @@
-use fj_debug::{DebugInfo, TriangleEdgeCheck};
+use fj_interop::debug::{DebugInfo, TriangleEdgeCheck};
 use fj_math::{Point, PolyChain, Segment};
 
 use crate::geometry::Surface;
@@ -218,7 +218,7 @@ impl Polygon {
 
 #[cfg(test)]
 mod tests {
-    use fj_debug::DebugInfo;
+    use fj_interop::debug::DebugInfo;
     use fj_math::{Point, PolyChain};
 
     use crate::geometry::Surface;

fj-operations/Cargo.toml

@@ -23,9 +23,9 @@ path    = "../fj"
 version = "0.5.0"
 path = "../fj-math"
 
-[dependencies.fj-debug]
+[dependencies.fj-interop]
 version = "0.5.0"
-path    = "../fj-debug"
+path = "../fj-interop"
 
 [dependencies.fj-kernel]
 version = "0.5.0"

fj-operations/src/circle.rs

@@ -1,4 +1,4 @@
-use fj_debug::DebugInfo;
+use fj_interop::debug::DebugInfo;
 use fj_kernel::{
     geometry::Surface,
     shape::Shape,

fj-operations/src/difference_2d.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use fj_debug::DebugInfo;
+use fj_interop::debug::DebugInfo;
 use fj_kernel::{
     shape::{Handle, Shape},
     topology::{Cycle, Edge, Face, Vertex},

fj-operations/src/group.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use fj_debug::DebugInfo;
+use fj_interop::debug::DebugInfo;
 use fj_kernel::{
     shape::Shape,
     topology::{Cycle, Edge, Face, Vertex},

fj-operations/src/lib.rs

@@ -13,7 +13,7 @@ mod sketch;
 mod sweep;
 mod transform;
 
-use fj_debug::DebugInfo;
+use fj_interop::debug::DebugInfo;
 use fj_kernel::shape::Shape;
 use fj_math::{Aabb, Scalar};
 

fj-operations/src/sketch.rs

@@ -1,4 +1,4 @@
-use fj_debug::DebugInfo;
+use fj_interop::debug::DebugInfo;
 use fj_kernel::{
     geometry::Surface,
     shape::Shape,

fj-operations/src/sweep.rs

@@ -1,4 +1,4 @@
-use fj_debug::DebugInfo;
+use fj_interop::debug::DebugInfo;
 use fj_kernel::{algorithms::sweep_shape, shape::Shape};
 use fj_math::{Aabb, Scalar, Vector};
 

fj-operations/src/transform.rs

@@ -1,4 +1,4 @@
-use fj_debug::DebugInfo;
+use fj_interop::debug::DebugInfo;
 use fj_kernel::shape::Shape;
 use fj_math::{Aabb, Scalar, Transform};
 use parry3d_f64::math::Isometry;