Merge pull request #2300 from hannobraun/validation

Make small cleanups in validation code
hannobraun · Mar 27, 2024 · 4699d6d · 4699d6d
2 parents 8b21004 + 5055eea
commit 4699d6d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/crates/fj-core/src/validate/edge.rs → crates/fj-core/src/validate/half_edge.rs b/crates/fj-core/src/validate/edge.rs → crates/fj-core/src/validate/half_edge.rs
@@ -15,7 +15,3 @@ impl Validate for HalfEdge {
     ) {
     }
 }
-
-/// [`HalfEdge`] validation failed
-#[derive(Clone, Debug, thiserror::Error)]
-pub enum EdgeValidationError {}
diff --git a/crates/fj-core/src/validate/mod.rs b/crates/fj-core/src/validate/mod.rs
@@ -63,8 +63,8 @@
 
 mod curve;
 mod cycle;
-mod edge;
 mod face;
+mod half_edge;
 mod references;
 mod region;
 mod shell;
@@ -79,8 +79,8 @@ use crate::{
 };
 
 pub use self::{
-    edge::EdgeValidationError, shell::ShellValidationError,
-    sketch::SketchValidationError, solid::SolidValidationError,
+    shell::ShellValidationError, sketch::SketchValidationError,
+    solid::SolidValidationError,
 };
 
 /// Assert that some object has a validation error which matches a specific

diff --git a/crates/fj-core/src/validation/error.rs b/crates/fj-core/src/validation/error.rs
@@ -1,8 +1,7 @@
 use std::{convert::Infallible, fmt};
 
 use crate::validate::{
-    EdgeValidationError, ShellValidationError, SketchValidationError,
-    SolidValidationError,
+    ShellValidationError, SketchValidationError, SolidValidationError,
 };
 
 use super::checks::{
@@ -25,10 +24,6 @@ pub enum ValidationError {
     #[error(transparent)]
     InteriorCycleHasInvalidWinding(#[from] InteriorCycleHasInvalidWinding),
 
-    /// `Edge` validation error
-    #[error("`Edge` validation error")]
-    Edge(#[from] EdgeValidationError),
-
     /// `Shell` validation error
     #[error("`Shell` validation error")]
     Shell(#[from] ShellValidationError),