From 003cfada4535ba505b54e87e076f68970743b70a Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 27 Mar 2024 10:56:20 +0100 Subject: [PATCH 1/2] Remove unused code --- crates/fj-core/src/validate/edge.rs | 4 ---- crates/fj-core/src/validate/mod.rs | 4 ++-- crates/fj-core/src/validation/error.rs | 7 +------ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/crates/fj-core/src/validate/edge.rs b/crates/fj-core/src/validate/edge.rs index 1c66a2435..157e68768 100644 --- a/crates/fj-core/src/validate/edge.rs +++ b/crates/fj-core/src/validate/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 index e0103a2a9..7de265bb0 100644 --- a/crates/fj-core/src/validate/mod.rs +++ b/crates/fj-core/src/validate/mod.rs @@ -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 index 247b49d28..559285d65 100644 --- 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), From 5055eead2a5f8fce0bd98ea88732d3bd968588d0 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 27 Mar 2024 10:56:49 +0100 Subject: [PATCH 2/2] Update module name --- crates/fj-core/src/validate/{edge.rs => half_edge.rs} | 0 crates/fj-core/src/validate/mod.rs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename crates/fj-core/src/validate/{edge.rs => half_edge.rs} (100%) diff --git a/crates/fj-core/src/validate/edge.rs b/crates/fj-core/src/validate/half_edge.rs similarity index 100% rename from crates/fj-core/src/validate/edge.rs rename to crates/fj-core/src/validate/half_edge.rs diff --git a/crates/fj-core/src/validate/mod.rs b/crates/fj-core/src/validate/mod.rs index 7de265bb0..c91b9944a 100644 --- 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;