From 899b401265a782435b13950f79a9071dd7018814 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 9 Nov 2022 12:05:18 +0100 Subject: [PATCH] Rename `Validate2` to `Validate` This completes the transition to the new validation infrastructure. --- crates/fj-kernel/src/objects/mod.rs | 2 +- crates/fj-kernel/src/validate/curve.rs | 6 +++--- crates/fj-kernel/src/validate/cycle.rs | 6 +++--- crates/fj-kernel/src/validate/edge.rs | 8 ++++---- crates/fj-kernel/src/validate/face.rs | 6 +++--- crates/fj-kernel/src/validate/mod.rs | 2 +- crates/fj-kernel/src/validate/shell.rs | 4 ++-- crates/fj-kernel/src/validate/sketch.rs | 4 ++-- crates/fj-kernel/src/validate/solid.rs | 4 ++-- crates/fj-kernel/src/validate/surface.rs | 4 ++-- crates/fj-kernel/src/validate/vertex.rs | 10 +++++----- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/crates/fj-kernel/src/objects/mod.rs b/crates/fj-kernel/src/objects/mod.rs index c35a28972..d0406c0c9 100644 --- a/crates/fj-kernel/src/objects/mod.rs +++ b/crates/fj-kernel/src/objects/mod.rs @@ -104,7 +104,7 @@ use crate::{ storage::{Handle, Store}, validate::{ CycleValidationError, FaceValidationError, HalfEdgeValidationError, - SurfaceVertexValidationError, Validate2, VertexValidationError, + SurfaceVertexValidationError, Validate, VertexValidationError, }, }; diff --git a/crates/fj-kernel/src/validate/curve.rs b/crates/fj-kernel/src/validate/curve.rs index 95e680f8f..d7a8e6e87 100644 --- a/crates/fj-kernel/src/validate/curve.rs +++ b/crates/fj-kernel/src/validate/curve.rs @@ -2,9 +2,9 @@ use std::convert::Infallible; use crate::objects::{Curve, GlobalCurve}; -use super::{Validate2, ValidationConfig}; +use super::{Validate, ValidationConfig}; -impl Validate2 for Curve { +impl Validate for Curve { type Error = Infallible; fn validate_with_config( @@ -15,7 +15,7 @@ impl Validate2 for Curve { } } -impl Validate2 for GlobalCurve { +impl Validate for GlobalCurve { type Error = Infallible; fn validate_with_config( diff --git a/crates/fj-kernel/src/validate/cycle.rs b/crates/fj-kernel/src/validate/cycle.rs index 22603cd9f..d20c74750 100644 --- a/crates/fj-kernel/src/validate/cycle.rs +++ b/crates/fj-kernel/src/validate/cycle.rs @@ -5,9 +5,9 @@ use crate::{ storage::Handle, }; -use super::{Validate2, ValidationConfig}; +use super::{Validate, ValidationConfig}; -impl Validate2 for Cycle { +impl Validate for Cycle { type Error = CycleValidationError; fn validate_with_config( @@ -69,7 +69,7 @@ mod tests { builder::{CycleBuilder, HalfEdgeBuilder, VertexBuilder}, objects::{Cycle, Objects}, partial::HasPartial, - validate::Validate2, + validate::Validate, }; #[test] diff --git a/crates/fj-kernel/src/validate/edge.rs b/crates/fj-kernel/src/validate/edge.rs index 6db571ebd..ab105ea32 100644 --- a/crates/fj-kernel/src/validate/edge.rs +++ b/crates/fj-kernel/src/validate/edge.rs @@ -11,9 +11,9 @@ use crate::{ storage::Handle, }; -use super::{Validate2, ValidationConfig}; +use super::{Validate, ValidationConfig}; -impl Validate2 for HalfEdge { +impl Validate for HalfEdge { type Error = HalfEdgeValidationError; fn validate_with_config( @@ -33,7 +33,7 @@ impl Validate2 for HalfEdge { } } -impl Validate2 for GlobalEdge { +impl Validate for GlobalEdge { type Error = Infallible; fn validate_with_config( @@ -204,7 +204,7 @@ mod tests { builder::{HalfEdgeBuilder, VertexBuilder}, objects::{GlobalCurve, HalfEdge, Objects}, partial::HasPartial, - validate::Validate2, + validate::Validate, }; #[test] diff --git a/crates/fj-kernel/src/validate/face.rs b/crates/fj-kernel/src/validate/face.rs index e4881e784..166afb827 100644 --- a/crates/fj-kernel/src/validate/face.rs +++ b/crates/fj-kernel/src/validate/face.rs @@ -5,9 +5,9 @@ use crate::{ storage::Handle, }; -use super::{Validate2, ValidationConfig}; +use super::{Validate, ValidationConfig}; -impl Validate2 for Face { +impl Validate for Face { type Error = FaceValidationError; fn validate_with_config( @@ -108,7 +108,7 @@ mod tests { builder::CycleBuilder, objects::{Cycle, Face, Objects}, partial::HasPartial, - validate::Validate2, + validate::Validate, }; #[test] diff --git a/crates/fj-kernel/src/validate/mod.rs b/crates/fj-kernel/src/validate/mod.rs index 4b4c94d9f..249deda32 100644 --- a/crates/fj-kernel/src/validate/mod.rs +++ b/crates/fj-kernel/src/validate/mod.rs @@ -36,7 +36,7 @@ use std::convert::Infallible; use fj_math::Scalar; /// Validate an object -pub trait Validate2: Sized { +pub trait Validate: Sized { /// The error that validation of the implementing type can result in type Error: Into; diff --git a/crates/fj-kernel/src/validate/shell.rs b/crates/fj-kernel/src/validate/shell.rs index e8a9756e6..e71626fad 100644 --- a/crates/fj-kernel/src/validate/shell.rs +++ b/crates/fj-kernel/src/validate/shell.rs @@ -2,9 +2,9 @@ use std::convert::Infallible; use crate::objects::Shell; -use super::{Validate2, ValidationConfig}; +use super::{Validate, ValidationConfig}; -impl Validate2 for Shell { +impl Validate for Shell { type Error = Infallible; fn validate_with_config( diff --git a/crates/fj-kernel/src/validate/sketch.rs b/crates/fj-kernel/src/validate/sketch.rs index 7b9ebc8d8..1a1896658 100644 --- a/crates/fj-kernel/src/validate/sketch.rs +++ b/crates/fj-kernel/src/validate/sketch.rs @@ -2,9 +2,9 @@ use std::convert::Infallible; use crate::objects::Sketch; -use super::{Validate2, ValidationConfig}; +use super::{Validate, ValidationConfig}; -impl Validate2 for Sketch { +impl Validate for Sketch { type Error = Infallible; fn validate_with_config( diff --git a/crates/fj-kernel/src/validate/solid.rs b/crates/fj-kernel/src/validate/solid.rs index b75954be2..9e484cb4b 100644 --- a/crates/fj-kernel/src/validate/solid.rs +++ b/crates/fj-kernel/src/validate/solid.rs @@ -2,9 +2,9 @@ use std::convert::Infallible; use crate::objects::Solid; -use super::{Validate2, ValidationConfig}; +use super::{Validate, ValidationConfig}; -impl Validate2 for Solid { +impl Validate for Solid { type Error = Infallible; fn validate_with_config( diff --git a/crates/fj-kernel/src/validate/surface.rs b/crates/fj-kernel/src/validate/surface.rs index 219bb8404..8c1998787 100644 --- a/crates/fj-kernel/src/validate/surface.rs +++ b/crates/fj-kernel/src/validate/surface.rs @@ -2,9 +2,9 @@ use std::convert::Infallible; use crate::objects::Surface; -use super::{Validate2, ValidationConfig}; +use super::{Validate, ValidationConfig}; -impl Validate2 for Surface { +impl Validate for Surface { type Error = Infallible; fn validate_with_config( diff --git a/crates/fj-kernel/src/validate/vertex.rs b/crates/fj-kernel/src/validate/vertex.rs index 3055f88fa..39d6d082d 100644 --- a/crates/fj-kernel/src/validate/vertex.rs +++ b/crates/fj-kernel/src/validate/vertex.rs @@ -7,9 +7,9 @@ use crate::{ storage::Handle, }; -use super::{Validate2, ValidationConfig}; +use super::{Validate, ValidationConfig}; -impl Validate2 for Vertex { +impl Validate for Vertex { type Error = VertexValidationError; fn validate_with_config( @@ -22,7 +22,7 @@ impl Validate2 for Vertex { } } -impl Validate2 for SurfaceVertex { +impl Validate for SurfaceVertex { type Error = SurfaceVertexValidationError; fn validate_with_config( @@ -34,7 +34,7 @@ impl Validate2 for SurfaceVertex { } } -impl Validate2 for GlobalVertex { +impl Validate for GlobalVertex { type Error = Infallible; fn validate_with_config( @@ -182,7 +182,7 @@ mod tests { builder::{CurveBuilder, SurfaceVertexBuilder}, objects::{Curve, GlobalVertex, Objects, SurfaceVertex, Vertex}, partial::HasPartial, - validate::Validate2, + validate::Validate, }; #[test]