Merge pull request #454 from hannobraun/interop

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

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

@@ -1,65 +1,65 @@
 [package]
-name    = "fj-app"
+name = "fj-app"
 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"]
-categories  = ["mathematics", "rendering"]
+readme = "../README.md"
+repository = "https://github.com/hannobraun/fornjot"
+license = "0BSD"
+keywords = ["cad", "programmatic", "code-cad"]
+categories = ["mathematics", "rendering"]
 
 
 [dependencies]
-anyhow      = "1.0.56"
-bytemuck    = "1.9.1"
-futures     = "0.3.21"
-nalgebra    = "0.30.0"
+anyhow = "1.0.56"
+bytemuck = "1.9.1"
+futures = "0.3.21"
+nalgebra = "0.30.0"
 parry3d-f64 = "0.8.0"
-thiserror   = "1.0.30"
-threemf     = "0.2.0"
-tracing     = "0.1.33"
-wgpu        = "0.12.0"
-wgpu_glyph  = "0.16.0"
-winit       = "0.26.1"
+thiserror = "1.0.30"
+threemf = "0.2.0"
+tracing = "0.1.33"
+wgpu = "0.12.0"
+wgpu_glyph = "0.16.0"
+winit = "0.26.1"
 
 [dependencies.clap]
-version  = "3.1.8"
+version = "3.1.8"
 features = ["derive"]
 
 [dependencies.figment]
-version  = "0.10.6"
+version = "0.10.6"
 features = ["env", "toml"]
 
 [dependencies.fj]
 version = "0.5.0"
-path    = "../fj"
+path = "../fj"
 
-[dependencies.fj-debug]
+[dependencies.fj-host]
 version = "0.5.0"
-path    = "../fj-debug"
+path = "../fj-host"
 
-[dependencies.fj-host]
+[dependencies.fj-interop]
 version = "0.5.0"
-path    = "../fj-host"
+path = "../fj-interop"
 
 [dependencies.fj-kernel]
 version = "0.5.0"
-path    = "../fj-kernel"
+path = "../fj-kernel"
 
 [dependencies.fj-math]
 version = "0.5.0"
-path    = "../fj-math"
+path = "../fj-math"
 
 [dependencies.fj-operations]
 version = "0.5.0"
-path    = "../fj-operations"
+path = "../fj-operations"
 
 [dependencies.serde]
-version  = "1.0.136"
+version = "1.0.136"
 features = ["derive"]
 
 [dependencies.tracing-subscriber]
-version  = "0.3.11"
+version = "0.3.11"
 features = ["env-filter", "fmt"]

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-host/Cargo.toml

@@ -1,20 +1,20 @@
 [package]
-name    = "fj-host"
+name = "fj-host"
 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"]
+readme = "../README.md"
+repository = "https://github.com/hannobraun/fornjot"
+license = "0BSD"
+keywords = ["cad", "programmatic", "code-cad"]
 
 
 [dependencies]
 libloading = "0.7.2"
-notify     = "5.0.0-pre.14"
-thiserror  = "1.0.30"
+notify = "5.0.0-pre.14"
+thiserror = "1.0.30"
 
 [dependencies.fj]
 version = "0.5.0"
-path    = "../fj"
+path = "../fj"

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-debug/src/lib.rs → 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

@@ -1,34 +1,34 @@
 [package]
-name    = "fj-kernel"
+name = "fj-kernel"
 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"]
-categories  = ["mathematics"]
+readme = "../README.md"
+repository = "https://github.com/hannobraun/fornjot"
+license = "0BSD"
+keywords = ["cad", "programmatic", "code-cad"]
+categories = ["mathematics"]
 
 
 [dependencies]
-anyhow      = "1.0.56"
-anymap      = "1.0.0-beta.2"
-approx      = "0.5.1"
-map-macro   = "0.2.0"
-nalgebra    = "0.30.0"
+anyhow = "1.0.56"
+anymap = "1.0.0-beta.2"
+approx = "0.5.1"
+map-macro = "0.2.0"
+nalgebra = "0.30.0"
 parking_lot = "0.12.0"
 parry2d-f64 = "0.8.0"
 parry3d-f64 = "0.8.0"
-robust      = "0.2.3"
-slotmap     = "1.0.6"
-spade       = "2.0.0"
-thiserror   = "1.0.30"
+robust = "0.2.3"
+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"
-path    = "../fj-math"
+path = "../fj-math"

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-math/Cargo.toml

@@ -1,19 +1,19 @@
 [package]
-name    = "fj-math"
+name = "fj-math"
 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"]
-categories  = ["mathematics"]
+readme = "../README.md"
+repository = "https://github.com/hannobraun/fornjot"
+license = "0BSD"
+keywords = ["cad", "programmatic", "code-cad"]
+categories = ["mathematics"]
 
 [dependencies]
-approx      = "0.5.1"
-decorum     = "0.3.1"
-nalgebra    = "0.30.0"
-num-traits  = "0.2.14"
+approx = "0.5.1"
+decorum = "0.3.1"
+nalgebra = "0.30.0"
+num-traits = "0.2.14"
 parry2d-f64 = "0.8.0"
 parry3d-f64 = "0.8.0"