Merge pull request #1737 from hannobraun/validate

Make minor cleanups in `Solid` validation code
hannobraun · Mar 28, 2023 · 96278e8 · 96278e8
2 parents d9dba81 + 7da50a3
commit 96278e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/crates/fj-kernel/src/builder/mod.rs b/crates/fj-kernel/src/builder/mod.rs
@@ -1,6 +1,5 @@
 //! API for building objects
 
-// These are new-style builders that build on top of the partial object API.
 mod cycle;
 mod edge;
 mod face;

diff --git a/crates/fj-kernel/src/validate/solid.rs b/crates/fj-kernel/src/validate/solid.rs
@@ -23,12 +23,12 @@ impl Validate for Solid {
 pub enum SolidValidationError {
     /// [`Solid`] contains vertices that are coincident, but not identical
     #[error(
-        "Solid contains Vertices that are coinciendent but not identical\n
+        "Solid contains Vertices that are coincident but not identical\n
         Vertex 1: {:#?} {:#?}
         Vertex 2: {:#?} {:#?}
         ", .0[0].0, .0[0].1,.0[1].0,.0[1].1
     )]
-    DistinctVertsCoincide([(Handle<Vertex>, Point<3>); 2]),
+    DistinctVerticesCoincide([(Handle<Vertex>, Point<3>); 2]),
 
     /// [`Solid`] contains vertices that are identical, but do not coincide
     #[error(
@@ -37,7 +37,7 @@ pub enum SolidValidationError {
         Vertex 2: {:#?} {:#?}
         ", .0[0].0, .0[0].1,.0[1].0,.0[1].1
     )]
-    IdenticalVertsNotCoincident([(Handle<Vertex>, Point<3>); 2]),
+    IdenticalVerticesNotCoincident([(Handle<Vertex>, Point<3>); 2]),
 }
 
 impl SolidValidationError {
@@ -72,7 +72,7 @@ impl SolidValidationError {
                         if a.0.distance_to(&b.0) > config.identical_max_distance
                         {
                             errors.push(
-                                Self::IdenticalVertsNotCoincident([
+                                Self::IdenticalVerticesNotCoincident([
                                     (a.1.clone(), a.0),
                                     (b.1.clone(), b.0),
                                 ])
@@ -84,7 +84,7 @@ impl SolidValidationError {
                         if a.0.distance_to(&b.0) < config.distinct_min_distance
                         {
                             errors.push(
-                                Self::DistinctVertsCoincide([
+                                Self::DistinctVerticesCoincide([
                                     (a.1.clone(), a.0),
                                     (b.1.clone(), b.0),
                                 ])