From fd1b7deba759b3e98dc5c55c47047d7f75b03fe2 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 11 Nov 2022 13:37:15 +0100 Subject: [PATCH] Remove redundant code --- crates/fj-kernel/src/partial/objects/curve.rs | 10 ---------- crates/fj-kernel/src/partial/objects/cycle.rs | 5 ----- crates/fj-kernel/src/partial/objects/edge.rs | 10 ---------- crates/fj-kernel/src/partial/objects/face.rs | 5 ----- crates/fj-kernel/src/partial/objects/mod.rs | 4 ---- crates/fj-kernel/src/partial/objects/vertex.rs | 15 --------------- crates/fj-kernel/src/partial/traits.rs | 3 --- 7 files changed, 52 deletions(-) diff --git a/crates/fj-kernel/src/partial/objects/curve.rs b/crates/fj-kernel/src/partial/objects/curve.rs index c073106e8..233b6b2c7 100644 --- a/crates/fj-kernel/src/partial/objects/curve.rs +++ b/crates/fj-kernel/src/partial/objects/curve.rs @@ -59,11 +59,6 @@ impl PartialCurve { self } - /// Merge this partial object with another - pub fn merge_with(self, other: Self) -> Self { - ::merge_with(self, other) - } - /// Build a full [`Curve`] from the partial curve pub fn build(self, objects: &Objects) -> Result { let path = self.path.expect("Can't build `Curve` without path"); @@ -116,11 +111,6 @@ impl From<&Curve> for PartialCurve { pub struct PartialGlobalCurve; impl PartialGlobalCurve { - /// Merge this partial object with another - pub fn merge_with(self, other: Self) -> Self { - ::merge_with(self, other) - } - /// Build a full [`GlobalCurve`] from the partial global curve pub fn build(self, _: &Objects) -> Result { Ok(GlobalCurve) diff --git a/crates/fj-kernel/src/partial/objects/cycle.rs b/crates/fj-kernel/src/partial/objects/cycle.rs index 38b1b0e14..a802133e3 100644 --- a/crates/fj-kernel/src/partial/objects/cycle.rs +++ b/crates/fj-kernel/src/partial/objects/cycle.rs @@ -64,11 +64,6 @@ impl PartialCycle { self } - /// Merge this partial object with another - pub fn merge_with(self, other: Self) -> Self { - ::merge_with(self, other) - } - /// Build a full [`Cycle`] from the partial cycle pub fn build( mut self, diff --git a/crates/fj-kernel/src/partial/objects/edge.rs b/crates/fj-kernel/src/partial/objects/edge.rs index e0ecd28f3..40e32906e 100644 --- a/crates/fj-kernel/src/partial/objects/edge.rs +++ b/crates/fj-kernel/src/partial/objects/edge.rs @@ -92,11 +92,6 @@ impl PartialHalfEdge { self } - /// Merge this partial object with another - pub fn merge_with(self, other: Self) -> Self { - ::merge_with(self, other) - } - /// Build a full [`HalfEdge`] from the partial half-edge pub fn build(self, objects: &Objects) -> Result { let curve = self.curve.into_full(objects)?; @@ -184,11 +179,6 @@ impl PartialGlobalEdge { self } - /// Merge this partial object with another - pub fn merge_with(self, other: Self) -> Self { - ::merge_with(self, other) - } - /// Build a full [`GlobalEdge`] from the partial global edge pub fn build( self, diff --git a/crates/fj-kernel/src/partial/objects/face.rs b/crates/fj-kernel/src/partial/objects/face.rs index e96bcf4d4..02d837484 100644 --- a/crates/fj-kernel/src/partial/objects/face.rs +++ b/crates/fj-kernel/src/partial/objects/face.rs @@ -70,11 +70,6 @@ impl PartialFace { self } - /// Merge this partial object with another - pub fn merge_with(self, other: Self) -> Self { - ::merge_with(self, other) - } - /// Construct a polygon from a list of points pub fn build(self, objects: &Objects) -> Result { let exterior = self.exterior.into_full(objects)?; diff --git a/crates/fj-kernel/src/partial/objects/mod.rs b/crates/fj-kernel/src/partial/objects/mod.rs index 277752a94..917f53a56 100644 --- a/crates/fj-kernel/src/partial/objects/mod.rs +++ b/crates/fj-kernel/src/partial/objects/mod.rs @@ -25,10 +25,6 @@ macro_rules! impl_traits { impl Partial for $partial { type Full = $full; - fn merge_with(self, other: Self) -> Self { - self.merge_with(other) - } - fn build(self, objects: &Objects) -> Result< Self::Full, diff --git a/crates/fj-kernel/src/partial/objects/vertex.rs b/crates/fj-kernel/src/partial/objects/vertex.rs index 9190e2ecc..eaa7ac355 100644 --- a/crates/fj-kernel/src/partial/objects/vertex.rs +++ b/crates/fj-kernel/src/partial/objects/vertex.rs @@ -60,11 +60,6 @@ impl PartialVertex { self } - /// Merge this partial object with another - pub fn merge_with(self, other: Self) -> Self { - ::merge_with(self, other) - } - /// Build a full [`Vertex`] from the partial vertex /// /// # Panics @@ -173,11 +168,6 @@ impl PartialSurfaceVertex { self } - /// Merge this partial object with another - pub fn merge_with(self, other: Self) -> Self { - ::merge_with(self, other) - } - /// Build a full [`SurfaceVertex`] from the partial surface vertex pub fn build( self, @@ -248,11 +238,6 @@ impl PartialGlobalVertex { self } - /// Merge this partial object with another - pub fn merge_with(self, other: Self) -> Self { - ::merge_with(self, other) - } - /// Build a full [`GlobalVertex`] from the partial global vertex pub fn build(self, _: &Objects) -> Result { let position = self diff --git a/crates/fj-kernel/src/partial/traits.rs b/crates/fj-kernel/src/partial/traits.rs index c0b1a1d54..3b149317b 100644 --- a/crates/fj-kernel/src/partial/traits.rs +++ b/crates/fj-kernel/src/partial/traits.rs @@ -68,9 +68,6 @@ pub trait Partial: Default + for<'a> From<&'a Self::Full> { /// The type representing the full variant of this object type Full; - /// Merge another partial object of the same type into this one - fn merge_with(self, other: Self) -> Self; - /// Build a full object from this partial one /// /// Implementations of this method will typically try to infer any missing