@@ -25,7 +25,7 @@ use crate::logging::{TimelyLogger, MessagesEvent};
25
25
use crate :: progress:: Timestamp ;
26
26
use crate :: progress:: timestamp:: Refines ;
27
27
use crate :: progress:: { Source , Target } ;
28
- use crate :: { Container , Data } ;
28
+ use crate :: Container ;
29
29
use crate :: communication:: Push ;
30
30
use crate :: dataflow:: channels:: pushers:: { Counter , PushOwned } ;
31
31
use crate :: dataflow:: channels:: Message ;
@@ -53,7 +53,7 @@ pub trait Enter<G: Scope, T: Timestamp+Refines<G::Timestamp>, C: Container> {
53
53
fn enter < ' a > ( self , _: & Child < ' a , G , T > ) -> OwnedStream < Child < ' a , G , T > , C > ;
54
54
}
55
55
56
- impl < G : Scope , T : Timestamp +Refines < G :: Timestamp > , C : Data + Container , S : StreamLike < G , C > > Enter < G , T , C > for S {
56
+ impl < G : Scope , T : Timestamp +Refines < G :: Timestamp > , C : Container + ' static , S : StreamLike < G , C > > Enter < G , T , C > for S {
57
57
fn enter < ' a > ( self , scope : & Child < ' a , G , T > ) -> OwnedStream < Child < ' a , G , T > , C > {
58
58
59
59
use crate :: scheduling:: Scheduler ;
@@ -130,14 +130,14 @@ impl<'a, G: Scope, C: Container + 'static, T: Timestamp+Refines<G::Timestamp>, S
130
130
}
131
131
132
132
133
- struct IngressNub < TOuter : Timestamp , TInner : Timestamp +Refines < TOuter > , TContainer : Container + Data > {
133
+ struct IngressNub < TOuter : Timestamp , TInner : Timestamp +Refines < TOuter > , TContainer : Container > {
134
134
targets : Counter < TInner , TContainer , PushOwned < TInner , TContainer > > ,
135
135
phantom : PhantomData < TOuter > ,
136
136
activator : crate :: scheduling:: Activator ,
137
137
active : bool ,
138
138
}
139
139
140
- impl < TOuter : Timestamp , TInner : Timestamp +Refines < TOuter > , TContainer : Container + Data > Push < Message < TOuter , TContainer > > for IngressNub < TOuter , TInner , TContainer > {
140
+ impl < TOuter : Timestamp , TInner : Timestamp +Refines < TOuter > , TContainer : Container > Push < Message < TOuter , TContainer > > for IngressNub < TOuter , TInner , TContainer > {
141
141
fn push ( & mut self , element : & mut Option < Message < TOuter , TContainer > > ) {
142
142
if let Some ( outer_message) = element {
143
143
let data = :: std:: mem:: take ( & mut outer_message. data ) ;
0 commit comments