Prepare to show more operations in tree

hannobraun · Feb 6, 2025 · a103498 · a103498
1 parent c1f9c5f
commit a103498
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 30 deletions.
diff --git a/experiments/2024-12-09/src/geometry/operation.rs b/experiments/2024-12-09/src/geometry/operation.rs
@@ -15,10 +15,8 @@ pub trait Operation {
     }
 }
 
-pub trait OperationOutput: Operation {
-    type Output;
-
-    fn output(&self) -> &Self::Output;
+pub trait OperationOutput<Output = Self>: Operation {
+    fn output(&self) -> &Output;
 }
 
 pub struct OperationDisplay<'r> {
@@ -103,9 +101,7 @@ impl Operation for AnyOp {
 }
 
 impl OperationOutput for AnyOp {
-    type Output = Self;
-
-    fn output(&self) -> &Self::Output {
+    fn output(&self) -> &Self {
         self
     }
 }
diff --git a/experiments/2024-12-09/src/geometry/triangle.rs b/experiments/2024-12-09/src/geometry/triangle.rs
@@ -40,9 +40,7 @@ impl Operation for Triangle {
 }
 
 impl OperationOutput for Triangle {
-    type Output = Self;
-
-    fn output(&self) -> &Self::Output {
+    fn output(&self) -> &Self {
         self
     }
 }
diff --git a/experiments/2024-12-09/src/topology/connect.rs b/experiments/2024-12-09/src/topology/connect.rs
@@ -75,10 +75,8 @@ impl Operation for Connect {
     }
 }
 
-impl OperationOutput for Connect {
-    type Output = Solid;
-
-    fn output(&self) -> &Self::Output {
+impl OperationOutput<Solid> for Connect {
+    fn output(&self) -> &Solid {
         &self.output
     }
 }
diff --git a/experiments/2024-12-09/src/topology/face.rs b/experiments/2024-12-09/src/topology/face.rs
@@ -121,9 +121,7 @@ impl Operation for Face {
 }
 
 impl OperationOutput for Face {
-    type Output = Self;
-
-    fn output(&self) -> &Self::Output {
+    fn output(&self) -> &Self {
         self
     }
 }

diff --git a/experiments/2024-12-09/src/topology/solid.rs b/experiments/2024-12-09/src/topology/solid.rs
@@ -36,9 +36,7 @@ impl Operation for Solid {
     }
 }
 impl OperationOutput for Solid {
-    type Output = Self;
-
-    fn output(&self) -> &Self::Output {
+    fn output(&self) -> &Self {
         self
     }
 }
diff --git a/experiments/2024-12-09/src/topology/sweep.rs b/experiments/2024-12-09/src/topology/sweep.rs
@@ -56,10 +56,8 @@ impl Operation for Sweep {
     }
 }
 
-impl OperationOutput for Sweep {
-    type Output = Solid;
-
-    fn output(&self) -> &Self::Output {
+impl OperationOutput<Solid> for Sweep {
+    fn output(&self) -> &Solid {
         self.output.output()
     }
 }
diff --git a/experiments/2024-12-09/src/topology/vertex.rs b/experiments/2024-12-09/src/topology/vertex.rs
@@ -44,9 +44,7 @@ impl Operation for Vertex {
 }
 
 impl OperationOutput for Vertex {
-    type Output = Self;
-
-    fn output(&self) -> &Self::Output {
+    fn output(&self) -> &Self {
         self
     }
 }
diff --git a/experiments/2024-12-09/src/view.rs b/experiments/2024-12-09/src/view.rs
@@ -133,9 +133,7 @@ impl Operation for OperationView {
 }
 
 impl OperationOutput for OperationView {
-    type Output = Self;
-
-    fn output(&self) -> &Self::Output {
+    fn output(&self) -> &Self {
         self
     }
 }