From 2d104db3c4db3bcd35cb2c7f62c40e8995452044 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 22 May 2024 20:08:25 +0200 Subject: [PATCH] Refactor to prepare for follow-on change --- crates/fj-core/src/validate/shell.rs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/crates/fj-core/src/validate/shell.rs b/crates/fj-core/src/validate/shell.rs index 1fd0a801f..e1533f7e5 100644 --- a/crates/fj-core/src/validate/shell.rs +++ b/crates/fj-core/src/validate/shell.rs @@ -36,6 +36,7 @@ impl Validate for Shell { ShellValidationError::check_half_edge_coincidence( self, geometry, config, ) + .map(ShellValidationError::CoincidentHalfEdgesAreNotSiblings) .map(Into::into), ); } @@ -55,7 +56,7 @@ impl ShellValidationError { shell: &Shell, geometry: &Geometry, config: &ValidationConfig, - ) -> impl Iterator { + ) -> impl Iterator { let mut errors = Vec::new(); let edges_and_surfaces = @@ -104,15 +105,13 @@ impl ShellValidationError { ) }); - errors.push(Self::CoincidentHalfEdgesAreNotSiblings( - CoincidentHalfEdgesAreNotSiblings { - boundaries, - curves, - vertices, - half_edge_a: half_edge_a.clone(), - half_edge_b: half_edge_b.clone(), - }, - )) + errors.push(CoincidentHalfEdgesAreNotSiblings { + boundaries, + curves, + vertices, + half_edge_a: half_edge_a.clone(), + half_edge_b: half_edge_b.clone(), + }) } } }