rebase

Signed-off-by: Moritz Hoffmann <[email protected]>

Author: antiguru

timely/examples/logging-send.rs

@@ -25,7 +25,7 @@ fn main() {
         worker.log_register().insert::<TimelyProgressEvent,_>("timely/progress", |_time, data|
             data.iter().for_each(|x| {
                 println!("PROGRESS: {:?}", x);
-                let (_, _, ev) = x;
+                let (_, ev) = x;
                 print!("PROGRESS: TYPED MESSAGES: ");
                 for (n, p, t, d) in ev.messages.iter() {
                     print!("{:?}, ", (n, p, t.as_any().downcast_ref::<usize>(), d));

timely/src/execute.rs

@@ -1,6 +1,5 @@
 //! Starts a timely dataflow execution from configuration information and per-worker logic.
 
-use timely_communication::logging::CommunicationEvent;
 use crate::communication::{initialize_from, Allocator, allocator::AllocateBuilder, WorkerGuards};
 use crate::dataflow::scopes::Child;
 use crate::worker::Worker;

timely/src/logging.rs

@@ -21,7 +21,7 @@ pub struct BatchLogger<T, P> where P: EventPusher<Duration, Vec<(Duration, T)>>
     _phantom: ::std::marker::PhantomData<T>,
 }
 
-impl<T, E, P> BatchLogger<T, P> where P: EventPusher<Duration, Vec<(Duration, T)>> {
+impl<T, P> BatchLogger<T, P> where P: EventPusher<Duration, Vec<(Duration, T)>> {
     /// Creates a new batch logger.
     pub fn new(event_pusher: P) -> Self {
         BatchLogger {
@@ -43,7 +43,7 @@ impl<T, E, P> BatchLogger<T, P> where P: EventPusher<Duration, Vec<(Duration, T)
         self.time = time;
     }
 }
-impl<T, P> Drop for BatchLogger<T, P> where P: EventPusher<Duration, Vec<(Duration, E, T)>> {
+impl<T, P> Drop for BatchLogger<T, P> where P: EventPusher<Duration, Vec<(Duration, T)>> {
     fn drop(&mut self) {
         self.event_pusher.push(Event::Progress(vec![(self.time, -1)]));
     }