From 407026178da44aa9b4e102b4b9c949f81940c731 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 24 May 2022 14:15:54 +0200 Subject: [PATCH] Remove redundant constructor --- crates/fj-kernel/src/shape/api.rs | 10 +++++----- crates/fj-kernel/src/shape/object.rs | 2 +- crates/fj-kernel/src/topology/builder.rs | 2 +- crates/fj-kernel/src/topology/vertex.rs | 5 ----- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/crates/fj-kernel/src/shape/api.rs b/crates/fj-kernel/src/shape/api.rs index 2e1966279..ca144dcb9 100644 --- a/crates/fj-kernel/src/shape/api.rs +++ b/crates/fj-kernel/src/shape/api.rs @@ -293,7 +293,7 @@ mod tests { assert!(shape.get_handle(&curve.get()).as_ref() == Some(&curve)); assert!(shape.get_handle(&surface.get()).as_ref() == Some(&surface)); - let vertex = Vertex::new(point); + let vertex = Vertex { point }; let edge = Edge::new(curve, None); assert!(shape.get_handle(&vertex).is_none()); @@ -326,23 +326,23 @@ mod tests { let mut other = Shape::new(); let point = shape.insert(Point::from([0., 0., 0.]))?; - shape.insert(Vertex::new(point))?; + shape.insert(Vertex { point })?; // Should fail, as `point` is not part of the shape. let point = other.insert(Point::from([1., 0., 0.]))?; - let result = shape.insert(Vertex::new(point)); + let result = shape.insert(Vertex { point }); assert!(matches!(result, Err(ValidationError::Structural(_)))); // `point` is too close to the original point. `assert!` is commented, // because that only causes a warning to be logged right now. let point = shape.insert(Point::from([5e-8, 0., 0.]))?; - let result = shape.insert(Vertex::new(point)); + let result = shape.insert(Vertex { point }); assert!(matches!(result, Err(ValidationError::Uniqueness(_)))); // `point` is farther than `MIN_DISTANCE` away from original point. // Should work. let point = shape.insert(Point::from([5e-6, 0., 0.]))?; - shape.insert(Vertex::new(point))?; + shape.insert(Vertex { point })?; Ok(()) } diff --git a/crates/fj-kernel/src/shape/object.rs b/crates/fj-kernel/src/shape/object.rs index 7d715538a..a08cd4636 100644 --- a/crates/fj-kernel/src/shape/object.rs +++ b/crates/fj-kernel/src/shape/object.rs @@ -91,7 +91,7 @@ impl Object for Vertex { ) -> ValidationResult { let point = self.point().merge_into(Some(self.point), shape, mapping)?; - let merged = shape.get_handle_or_insert(Vertex::new(point))?; + let merged = shape.get_handle_or_insert(Vertex { point })?; if let Some(handle) = handle { mapping.vertices.insert(handle, merged.clone()); diff --git a/crates/fj-kernel/src/topology/builder.rs b/crates/fj-kernel/src/topology/builder.rs index e178b453e..a79de2a6b 100644 --- a/crates/fj-kernel/src/topology/builder.rs +++ b/crates/fj-kernel/src/topology/builder.rs @@ -28,7 +28,7 @@ impl<'r> VertexBuilder<'r> { point: impl Into>, ) -> ValidationResult { let point = self.shape.get_handle_or_insert(point.into())?; - let vertex = self.shape.get_handle_or_insert(Vertex::new(point))?; + let vertex = self.shape.get_handle_or_insert(Vertex { point })?; Ok(vertex) } diff --git a/crates/fj-kernel/src/topology/vertex.rs b/crates/fj-kernel/src/topology/vertex.rs index 3894107b6..4e1cc44f4 100644 --- a/crates/fj-kernel/src/topology/vertex.rs +++ b/crates/fj-kernel/src/topology/vertex.rs @@ -37,11 +37,6 @@ pub struct Vertex { } impl Vertex { - /// Construct a new instance of `Vertex` - pub fn new(point: Handle>) -> Self { - Self { point } - } - /// Build a vertex using the [`VertexBuilder`] API pub fn builder(shape: &mut Shape) -> VertexBuilder { VertexBuilder::new(shape)