From b3cc84608ae2eb93ffef03fc69ca3720f5cf3066 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 24 Feb 2023 14:26:11 +0100 Subject: [PATCH] Inline `CurveBuilder` method --- crates/fj-kernel/src/builder/curve.rs | 17 ----------------- crates/fj-kernel/src/builder/edge.rs | 3 ++- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/crates/fj-kernel/src/builder/curve.rs b/crates/fj-kernel/src/builder/curve.rs index d91864962..44717b563 100644 --- a/crates/fj-kernel/src/builder/curve.rs +++ b/crates/fj-kernel/src/builder/curve.rs @@ -4,14 +4,6 @@ use crate::{geometry::path::SurfacePath, partial::PartialCurve}; /// Builder API for [`PartialCurve`] pub trait CurveBuilder { - /// Update partial curve to be a circle, from the provided radius - /// - /// Returns the updated path. - fn update_as_circle_from_radius( - &mut self, - radius: impl Into, - ) -> SurfacePath; - /// Update partial curve to be a circle, from the provided radius /// /// Returns the updated path. @@ -39,15 +31,6 @@ pub trait CurveBuilder { } impl CurveBuilder for PartialCurve { - fn update_as_circle_from_radius( - &mut self, - radius: impl Into, - ) -> SurfacePath { - let path = SurfacePath::circle_from_radius(radius); - self.path = Some(path.into()); - path - } - fn update_as_circle_from_center_and_radius( &mut self, center: impl Into>, diff --git a/crates/fj-kernel/src/builder/edge.rs b/crates/fj-kernel/src/builder/edge.rs index 8ba3a42e5..3d31d7415 100644 --- a/crates/fj-kernel/src/builder/edge.rs +++ b/crates/fj-kernel/src/builder/edge.rs @@ -92,7 +92,8 @@ impl HalfEdgeBuilder for PartialHalfEdge { &mut self, radius: impl Into, ) -> SurfacePath { - let path = self.curve.write().update_as_circle_from_radius(radius); + let path = SurfacePath::circle_from_radius(radius); + self.curve.write().path = Some(path.into()); let [a_curve, b_curve] = [Scalar::ZERO, Scalar::TAU].map(|coord| Point::from([coord]));