Refactor to prepare for follow-on change

This commit is contained in:
Hanno Braun 2024-05-22 20:07:38 +02:00
parent 2711e4c7fc
commit d63f88c1fd

View File

@ -32,9 +32,12 @@ impl Validate for Shell {
errors.extend( errors.extend(
HalfEdgeHasNoSibling::check(self, geometry, config).map(Into::into), HalfEdgeHasNoSibling::check(self, geometry, config).map(Into::into),
); );
errors.extend(ShellValidationError::check_half_edge_coincidence( errors.extend(
self, geometry, config, ShellValidationError::check_half_edge_coincidence(
)); self, geometry, config,
)
.map(Into::into),
);
} }
} }
@ -52,7 +55,7 @@ impl ShellValidationError {
shell: &Shell, shell: &Shell,
geometry: &Geometry, geometry: &Geometry,
config: &ValidationConfig, config: &ValidationConfig,
) -> impl Iterator<Item = ValidationError> { ) -> impl Iterator<Item = ShellValidationError> {
let mut errors = Vec::new(); let mut errors = Vec::new();
let edges_and_surfaces = let edges_and_surfaces =
@ -101,18 +104,15 @@ impl ShellValidationError {
) )
}); });
errors.push( errors.push(Self::CoincidentHalfEdgesAreNotSiblings(
Self::CoincidentHalfEdgesAreNotSiblings( CoincidentHalfEdgesAreNotSiblings {
CoincidentHalfEdgesAreNotSiblings { boundaries,
boundaries, curves,
curves, vertices,
vertices, half_edge_a: half_edge_a.clone(),
half_edge_a: half_edge_a.clone(), half_edge_b: half_edge_b.clone(),
half_edge_b: half_edge_b.clone(), },
}, ))
)
.into(),
)
} }
} }
} }