Merge pull request #2231 from hannobraun/validation

Unify `validate` and `validate_with_config`

crates/fj-core/src/layers/validation.rs

@@ -22,7 +22,7 @@ impl Command<Validation> for InsertObject {
         let mut errors = Vec::new();
 
         let object: AnyObject<Stored> = self.object.into();
-        object.validate_with_config(&state.config, &mut errors);
+        object.validate(&state.config, &mut errors);
 
         for err in errors {
             events.push(ValidationFailed {

crates/fj-core/src/objects/any_object.rs

@@ -34,23 +34,14 @@ macro_rules! any_object {
                 }
             }
 
-            /// Validate the object
-            pub fn validate(&self, errors: &mut Vec<ValidationError>) {
-                match self {
-                    $(
-                        Self::$ty(object) => object.validate(errors),
-                    )*
-                }
-            }
-
             /// Validate the object with a pre-defined validation configuration
-            pub fn validate_with_config(&self,
+            pub fn validate(&self,
                     config: &ValidationConfig,
                     errors: &mut Vec<ValidationError>
             ) {
                 match self {
                     $(
-                        Self::$ty(object) => object.validate_with_config(config, errors),
+                        Self::$ty(object) => object.validate(config, errors),
                     )*
                 }
             }

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

@@ -6,10 +6,5 @@ use crate::{
 use super::Validate;
 
 impl Validate for Curve {
-    fn validate_with_config(
-        &self,
-        _: &ValidationConfig,
-        _: &mut Vec<ValidationError>,
-    ) {
-    }
+    fn validate(&self, _: &ValidationConfig, _: &mut Vec<ValidationError>) {}
 }

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

@@ -9,7 +9,7 @@ use crate::{
 use super::Validate;
 
 impl Validate for Cycle {
-    fn validate_with_config(
+    fn validate(
         &self,
         config: &ValidationConfig,
         errors: &mut Vec<ValidationError>,

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

@@ -8,7 +8,7 @@ use crate::{
 use super::Validate;
 
 impl Validate for HalfEdge {
-    fn validate_with_config(
+    fn validate(
         &self,
         config: &ValidationConfig,
         errors: &mut Vec<ValidationError>,

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

@@ -8,7 +8,7 @@ use crate::{
 use super::Validate;
 
 impl Validate for Face {
-    fn validate_with_config(
+    fn validate(
         &self,
         _: &ValidationConfig,
         errors: &mut Vec<ValidationError>,

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

@@ -49,7 +49,7 @@
 //! that are very close together can be considered coincident. What should be
 //! considered "very close" is dependent on the scale that your model operates
 //! on, and this fact is taken into account by allowing for configuration via
-//! [`Validate::validate_with_config`] and [`ValidationConfig`].
+//! [`Validate::validate`] and [`ValidationConfig`].
 //!
 //!
 //! ## Implementation Note
@@ -88,7 +88,10 @@ macro_rules! assert_contains_err {
     ($o:tt,$p:pat) => {
         assert!({
             let mut errors = Vec::new();
-            $o.validate(&mut errors);
+            $o.validate(
+                &$crate::validation::ValidationConfig::default(),
+                &mut errors,
+            );
             errors.iter().any(|e| matches!(e, $p))
         })
     };
@@ -102,7 +105,7 @@ pub trait Validate: Sized {
     #[allow(clippy::result_large_err)]
     fn validate_and_return_first_error(&self) -> Result<(), ValidationError> {
         let mut errors = Vec::new();
-        self.validate(&mut errors);
+        self.validate(&ValidationConfig::default(), &mut errors);
 
         if let Some(err) = errors.into_iter().next() {
             return Err(err);
@@ -111,13 +114,8 @@ pub trait Validate: Sized {
         Ok(())
     }
 
-    /// Validate the object using default configuration
-    fn validate(&self, errors: &mut Vec<ValidationError>) {
-        self.validate_with_config(&ValidationConfig::default(), errors)
-    }
-
     /// Validate the object
-    fn validate_with_config(
+    fn validate(
         &self,
         config: &ValidationConfig,
         errors: &mut Vec<ValidationError>,

crates/fj-core/src/validate/region.rs

@@ -3,10 +3,5 @@ use crate::objects::Region;
 use super::{Validate, ValidationConfig, ValidationError};
 
 impl Validate for Region {
-    fn validate_with_config(
-        &self,
-        _: &ValidationConfig,
-        _: &mut Vec<ValidationError>,
-    ) {
-    }
+    fn validate(&self, _: &ValidationConfig, _: &mut Vec<ValidationError>) {}
 }

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

@@ -14,7 +14,7 @@ use crate::{
 use super::{Validate, ValidationConfig, ValidationError};
 
 impl Validate for Shell {
-    fn validate_with_config(
+    fn validate(
         &self,
         config: &ValidationConfig,
         errors: &mut Vec<ValidationError>,

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

@@ -6,7 +6,7 @@ use super::{
 };
 
 impl Validate for Sketch {
-    fn validate_with_config(
+    fn validate(
         &self,
         config: &ValidationConfig,
         errors: &mut Vec<ValidationError>,

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

@@ -13,7 +13,7 @@ use super::{
 };
 
 impl Validate for Solid {
-    fn validate_with_config(
+    fn validate(
         &self,
         config: &ValidationConfig,
         errors: &mut Vec<ValidationError>,

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

@@ -3,10 +3,5 @@ use crate::objects::Surface;
 use super::{Validate, ValidationConfig, ValidationError};
 
 impl Validate for Surface {
-    fn validate_with_config(
-        &self,
-        _: &ValidationConfig,
-        _: &mut Vec<ValidationError>,
-    ) {
-    }
+    fn validate(&self, _: &ValidationConfig, _: &mut Vec<ValidationError>) {}
 }

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

@@ -3,10 +3,5 @@ use crate::objects::Vertex;
 use super::{Validate, ValidationConfig, ValidationError};
 
 impl Validate for Vertex {
-    fn validate_with_config(
-        &self,
-        _: &ValidationConfig,
-        _: &mut Vec<ValidationError>,
-    ) {
-    }
+    fn validate(&self, _: &ValidationConfig, _: &mut Vec<ValidationError>) {}
 }