@@ -369,15 +369,6 @@ where
369
369
Tr :: Batch : Batch ,
370
370
Tr :: Batcher : Batcher < Input =C > ,
371
371
;
372
-
373
- /// Arranges updates into a shared trace, using a supplied parallelization contract, with a supplied name.
374
- fn arrange_core < P , Tr > ( & self , pact : P , name : & str ) -> Arranged < G , TraceAgent < Tr > >
375
- where
376
- P : ParallelizationContract < G :: Timestamp , C > ,
377
- Tr : Trace < Time =G :: Timestamp > +' static ,
378
- Tr :: Batch : Batch ,
379
- Tr :: Batcher : Batcher < Input =C > ,
380
- ;
381
372
}
382
373
383
374
impl < G , K , V , R > Arrange < G , Vec < ( ( K , V ) , G :: Timestamp , R ) > > for Collection < G , ( K , V ) , R >
@@ -395,17 +386,7 @@ where
395
386
Tr :: Batcher : Batcher < Input =Vec < ( ( K , V ) , G :: Timestamp , R ) > > ,
396
387
{
397
388
let exchange = Exchange :: new ( move |update : & ( ( K , V ) , G :: Timestamp , R ) | ( update. 0 ) . 0 . hashed ( ) . into ( ) ) ;
398
- self . arrange_core ( exchange, name)
399
- }
400
-
401
- fn arrange_core < P , Tr > ( & self , pact : P , name : & str ) -> Arranged < G , TraceAgent < Tr > >
402
- where
403
- P : ParallelizationContract < G :: Timestamp , Vec < ( ( K , V ) , G :: Timestamp , R ) > > ,
404
- Tr : Trace < Time =G :: Timestamp > +' static ,
405
- Tr :: Batch : Batch ,
406
- Tr :: Batcher : Batcher < Input =Vec < ( ( K , V ) , G :: Timestamp , R ) > > ,
407
- {
408
- arrange_core ( & self . inner , pact, name)
389
+ arrange_core ( & self . inner , exchange, name)
409
390
}
410
391
}
411
392
@@ -583,18 +564,7 @@ where
583
564
Tr :: Batcher : Batcher < Input =Vec < ( ( K , ( ) ) , G :: Timestamp , R ) > > ,
584
565
{
585
566
let exchange = Exchange :: new ( move |update : & ( ( K , ( ) ) , G :: Timestamp , R ) | ( update. 0 ) . 0 . hashed ( ) . into ( ) ) ;
586
- self . arrange_core ( exchange, name)
587
- }
588
-
589
- fn arrange_core < P , Tr > ( & self , pact : P , name : & str ) -> Arranged < G , TraceAgent < Tr > >
590
- where
591
- P : ParallelizationContract < G :: Timestamp , Vec < ( ( K , ( ) ) , G :: Timestamp , R ) > > ,
592
- Tr : Trace < Time =G :: Timestamp > +' static ,
593
- Tr :: Batch : Batch ,
594
- Tr :: Batcher : Batcher < Input =Vec < ( ( K , ( ) ) , G :: Timestamp , R ) > > ,
595
- {
596
- self . map ( |k| ( k, ( ) ) )
597
- . arrange_core ( pact, name)
567
+ arrange_core ( & self . map ( |k| ( k, ( ) ) ) . inner , exchange, name)
598
568
}
599
569
}
600
570
0 commit comments