From 56c62c835e2542dfa7e1a1b4c638ecb95a2d2ee5 Mon Sep 17 00:00:00 2001
From: Moritz Hoffmann <antiguru@gmail.com>
Date: Mon, 3 Jun 2024 21:04:16 -0400
Subject: [PATCH] Remove Arrange::arrange_core (#509)

The function is a thin wrapper around the freestanding `arrange_core`
function, and doesn't add any additional value. It's not used within
differential.

Signed-off-by: Moritz Hoffmann <antiguru@gmail.com>
---
 src/operators/arrange/arrangement.rs | 34 ++--------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/src/operators/arrange/arrangement.rs b/src/operators/arrange/arrangement.rs
index 370d085a6..ef14f2b92 100644
--- a/src/operators/arrange/arrangement.rs
+++ b/src/operators/arrange/arrangement.rs
@@ -369,15 +369,6 @@ where
         Tr::Batch: Batch,
         Tr::Batcher: Batcher<Input=C>,
     ;
-
-    /// Arranges updates into a shared trace, using a supplied parallelization contract, with a supplied name.
-    fn arrange_core<P, Tr>(&self, pact: P, name: &str) -> Arranged<G, TraceAgent<Tr>>
-    where
-        P: ParallelizationContract<G::Timestamp, C>,
-        Tr: Trace<Time=G::Timestamp>+'static,
-        Tr::Batch: Batch,
-        Tr::Batcher: Batcher<Input=C>,
-    ;
 }
 
 impl<G, K, V, R> Arrange<G, Vec<((K, V), G::Timestamp, R)>> for Collection<G, (K, V), R>
@@ -395,17 +386,7 @@ where
         Tr::Batcher: Batcher<Input=Vec<((K, V), G::Timestamp, R)>>,
     {
         let exchange = Exchange::new(move |update: &((K,V),G::Timestamp,R)| (update.0).0.hashed().into());
-        self.arrange_core(exchange, name)
-    }
-
-    fn arrange_core<P, Tr>(&self, pact: P, name: &str) -> Arranged<G, TraceAgent<Tr>>
-    where
-        P: ParallelizationContract<G::Timestamp, Vec<((K,V),G::Timestamp,R)>>,
-        Tr: Trace<Time=G::Timestamp>+'static,
-        Tr::Batch: Batch,
-        Tr::Batcher: Batcher<Input=Vec<((K,V),G::Timestamp,R)>>,
-    {
-        arrange_core(&self.inner, pact, name)
+        arrange_core(&self.inner, exchange, name)
     }
 }
 
@@ -583,18 +564,7 @@ where
         Tr::Batcher: Batcher<Input=Vec<((K, ()), G::Timestamp, R)>>,
     {
         let exchange = Exchange::new(move |update: &((K,()),G::Timestamp,R)| (update.0).0.hashed().into());
-        self.arrange_core(exchange, name)
-    }
-
-    fn arrange_core<P, Tr>(&self, pact: P, name: &str) -> Arranged<G, TraceAgent<Tr>>
-    where
-        P: ParallelizationContract<G::Timestamp, Vec<((K,()),G::Timestamp,R)>>,
-        Tr: Trace<Time=G::Timestamp>+'static,
-        Tr::Batch: Batch,
-        Tr::Batcher: Batcher<Input=Vec<((K,()),G::Timestamp,R)>>,
-    {
-        self.map(|k| (k, ()))
-            .arrange_core(pact, name)
+        arrange_core(&self.map(|k| (k, ())).inner, exchange, name)
     }
 }