Refine new validation infrastructure

crates/fj-kernel/src/validate/coherence.rs

@@ -2,7 +2,7 @@ use std::fmt;
 
 use fj_math::{Point, Scalar};
 
-use crate::objects::{Curve, Vertex};
+use crate::objects::Vertex;
 
 pub fn validate_vertex(
     vertex: &Vertex,
@@ -38,46 +38,11 @@ pub fn validate_vertex(
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, thiserror::Error)]
 pub enum CoherenceIssues {
-    /// Mismatch between the surface and global forms of a curve
-    #[error("Mismatch between surface and global forms of curve")]
-    Curve(#[from] CurveCoherenceMismatch),
-
     /// Mismatch between the local and global coordinates of a vertex
     #[error("Mismatch between local and global coordinates of vertex")]
     Vertex(#[from] VertexCoherenceMismatch),
 }
 
-/// A mismatch between the surface and global forms of a curve
-///
-/// Used in [`CoherenceIssues`].
-#[derive(Debug, thiserror::Error)]
-pub struct CurveCoherenceMismatch {
-    /// The curve coordinate for which a mismatch was found
-    pub point_curve: Point<1>,
-
-    /// The curve coordinate, converted to surface coordinates
-    pub point_surface: Point<2>,
-
-    /// The surface coordinates, converted to global coordinates
-    pub point_surface_as_global: Point<3>,
-
-    /// The curve coordinate, converted to global coordinates
-    pub point_global: Point<3>,
-
-    /// The incoherent curve
-    pub curve: Curve,
-}
-
-impl fmt::Display for CurveCoherenceMismatch {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "local: {:?} (converted to surface: {:?}; to global: {:?}), global: {:?},",
-            self.point_curve, self.point_surface, self.point_surface_as_global, self.point_global,
-        )
-    }
-}
-
 /// A mismatch between the local and global forms of a vertex
 ///
 /// Used in [`CoherenceIssues`].

crates/fj-kernel/src/validate/curve.rs

@@ -1,26 +1,27 @@
-use crate::{
-    objects::{Curve, GlobalCurve},
-    storage::Store,
-};
+use std::convert::Infallible;
 
-use super::{Validate2, ValidationConfig, ValidationError};
+use crate::objects::{Curve, GlobalCurve};
+
+use super::{Validate2, ValidationConfig};
 
 impl Validate2 for Curve {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }
 
 impl Validate2 for GlobalCurve {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }

crates/fj-kernel/src/validate/cycle.rs

@@ -1,13 +1,16 @@
-use crate::{objects::Cycle, storage::Store};
+use std::convert::Infallible;
 
-use super::{Validate2, ValidationConfig, ValidationError};
+use crate::objects::Cycle;
+
+use super::{Validate2, ValidationConfig};
 
 impl Validate2 for Cycle {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }

crates/fj-kernel/src/validate/edge.rs

@@ -1,26 +1,27 @@
-use crate::{
-    objects::{GlobalEdge, HalfEdge},
-    storage::Store,
-};
+use std::convert::Infallible;
 
-use super::{Validate2, ValidationConfig, ValidationError};
+use crate::objects::{GlobalEdge, HalfEdge};
+
+use super::{Validate2, ValidationConfig};
 
 impl Validate2 for HalfEdge {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }
 
 impl Validate2 for GlobalEdge {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }

crates/fj-kernel/src/validate/face.rs

@@ -1,13 +1,16 @@
-use crate::{objects::Face, storage::Store};
+use std::convert::Infallible;
 
-use super::{Validate2, ValidationConfig, ValidationError};
+use crate::objects::Face;
+
+use super::{Validate2, ValidationConfig};
 
 impl Validate2 for Face {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }

crates/fj-kernel/src/validate/mod.rs

@@ -31,11 +31,11 @@ pub use self::{
     uniqueness::UniquenessIssues,
 };
 
-use std::{collections::HashSet, ops::Deref};
+use std::{collections::HashSet, convert::Infallible, ops::Deref};
 
 use fj_math::Scalar;
 
-use crate::{iter::ObjectIters, storage::Store};
+use crate::iter::ObjectIters;
 
 /// Validate an object
 pub trait Validate: Sized {
@@ -104,17 +104,19 @@ where
 
 /// Validate an object
 pub trait Validate2: Sized {
+    /// The error that validation of the implementing type can result in
+    type Error: Into<ValidationError>;
+
     /// Validate the object using default configuration
-    fn validate(&self, store: &Store<Self>) -> Result<(), ValidationError> {
-        self.validate_with_config(store, &ValidationConfig::default())
+    fn validate(&self) -> Result<(), Self::Error> {
+        self.validate_with_config(&ValidationConfig::default())
     }
 
     /// Validate the object
     fn validate_with_config(
         &self,
-        store: &Store<Self>,
         config: &ValidationConfig,
-    ) -> Result<(), ValidationError>;
+    ) -> Result<(), Self::Error>;
 }
 
 /// Configuration required for the validation process
@@ -187,6 +189,12 @@ pub enum ValidationError {
     Uniqueness(#[from] UniquenessIssues),
 }
 
+impl From<Infallible> for ValidationError {
+    fn from(infallible: Infallible) -> Self {
+        match infallible {}
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use fj_interop::ext::ArrayExt;

crates/fj-kernel/src/validate/shell.rs

@@ -1,13 +1,16 @@
-use crate::{objects::Shell, storage::Store};
+use std::convert::Infallible;
 
-use super::{Validate2, ValidationConfig, ValidationError};
+use crate::objects::Shell;
+
+use super::{Validate2, ValidationConfig};
 
 impl Validate2 for Shell {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }

crates/fj-kernel/src/validate/sketch.rs

@@ -1,13 +1,16 @@
-use crate::{objects::Sketch, storage::Store};
+use std::convert::Infallible;
 
-use super::{Validate2, ValidationConfig, ValidationError};
+use crate::objects::Sketch;
+
+use super::{Validate2, ValidationConfig};
 
 impl Validate2 for Sketch {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }

crates/fj-kernel/src/validate/solid.rs

@@ -1,13 +1,16 @@
-use crate::{objects::Solid, storage::Store};
+use std::convert::Infallible;
 
-use super::{Validate2, ValidationConfig, ValidationError};
+use crate::objects::Solid;
+
+use super::{Validate2, ValidationConfig};
 
 impl Validate2 for Solid {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }

crates/fj-kernel/src/validate/surface.rs

@@ -1,13 +1,16 @@
-use crate::{objects::Surface, storage::Store};
+use std::convert::Infallible;
 
-use super::{Validate2, ValidationConfig, ValidationError};
+use crate::objects::Surface;
+
+use super::{Validate2, ValidationConfig};
 
 impl Validate2 for Surface {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }

crates/fj-kernel/src/validate/vertex.rs

@@ -1,36 +1,38 @@
-use crate::{
-    objects::{GlobalVertex, SurfaceVertex, Vertex},
-    storage::Store,
-};
+use std::convert::Infallible;
 
-use super::{Validate2, ValidationConfig, ValidationError};
+use crate::objects::{GlobalVertex, SurfaceVertex, Vertex};
+
+use super::{Validate2, ValidationConfig};
 
 impl Validate2 for Vertex {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }
 
 impl Validate2 for SurfaceVertex {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }
 
 impl Validate2 for GlobalVertex {
+    type Error = Infallible;
+
     fn validate_with_config(
         &self,
-        _: &Store<Self>,
         _: &ValidationConfig,
-    ) -> Result<(), ValidationError> {
+    ) -> Result<(), Self::Error> {
         Ok(())
     }
 }