From 97ac5c1f759897badde8a3379fdb068a0e3b74aa Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 18 Mar 2024 13:46:05 +0100 Subject: [PATCH] Expect `&Geometry` in `ValidationCheck` method --- .../fj-core/src/validation/checks/half_edge_connection.rs | 5 ++++- crates/fj-core/src/validation/validation_check.rs | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/crates/fj-core/src/validation/checks/half_edge_connection.rs b/crates/fj-core/src/validation/checks/half_edge_connection.rs index 04f45b2e9..5a2dec955 100644 --- a/crates/fj-core/src/validation/checks/half_edge_connection.rs +++ b/crates/fj-core/src/validation/checks/half_edge_connection.rs @@ -87,7 +87,10 @@ mod tests { let mut core = Core::new(); let valid = Cycle::polygon([[0., 0.], [1., 0.], [1., 1.]], &mut core); - AdjacentHalfEdgesNotConnected::check_and_return_first_error(&valid)?; + AdjacentHalfEdgesNotConnected::check_and_return_first_error( + &valid, + &core.layers.geometry, + )?; let invalid = valid.update_half_edge( valid.half_edges().first(), diff --git a/crates/fj-core/src/validation/validation_check.rs b/crates/fj-core/src/validation/validation_check.rs index 9e75b1aef..7190343d4 100644 --- a/crates/fj-core/src/validation/validation_check.rs +++ b/crates/fj-core/src/validation/validation_check.rs @@ -1,5 +1,7 @@ use std::fmt::Display; +use crate::geometry::Geometry; + use super::ValidationConfig; /// Run a specific validation check on an object @@ -17,7 +19,10 @@ pub trait ValidationCheck: Sized { /// /// This method is designed for convenience over flexibility (it is intended /// for use in unit tests), and thus always uses the default configuration. - fn check_and_return_first_error(object: &T) -> Result<(), Self> { + fn check_and_return_first_error( + object: &T, + _: &Geometry, + ) -> Result<(), Self> { let config = ValidationConfig::default(); let mut errors = Self::check(object, &config);