@@ -44,9 +44,9 @@ struct ComputeCell<'a, T: Copy> {
44
44
cell : Cell < T > ,
45
45
46
46
dependencies : Vec < CellID > ,
47
- f : Box < dyn Fn ( & [ T ] ) -> T + ' a > ,
47
+ f : Box < dyn ' a + Fn ( & [ T ] ) -> T > ,
48
48
callbacks_issued : usize ,
49
- callbacks : HashMap < CallbackID , Box < dyn FnMut ( T ) -> ( ) + ' a > > ,
49
+ callbacks : HashMap < CallbackID , Box < dyn ' a + FnMut ( T ) > > ,
50
50
}
51
51
52
52
impl < T : Copy > Cell < T > {
@@ -60,7 +60,7 @@ impl<T: Copy> Cell<T> {
60
60
}
61
61
62
62
impl < ' a , T : Copy > ComputeCell < ' a , T > {
63
- fn new < F : Fn ( & [ T ] ) -> T + ' a > ( initial : T , dependencies : Vec < CellID > , f : F ) -> Self {
63
+ fn new < F : ' a + Fn ( & [ T ] ) -> T > ( initial : T , dependencies : Vec < CellID > , f : F ) -> Self {
64
64
ComputeCell {
65
65
cell : Cell :: new ( initial) ,
66
66
@@ -90,7 +90,7 @@ impl<'a, T: Copy + PartialEq> Reactor<'a, T> {
90
90
InputCellID ( self . inputs . len ( ) - 1 )
91
91
}
92
92
93
- pub fn create_compute < F : Fn ( & [ T ] ) -> T + ' a > (
93
+ pub fn create_compute < F : ' a + Fn ( & [ T ] ) -> T > (
94
94
& mut self ,
95
95
dependencies : & [ CellID ] ,
96
96
compute_func : F ,
@@ -161,7 +161,7 @@ impl<'a, T: Copy + PartialEq> Reactor<'a, T> {
161
161
. is_some ( )
162
162
}
163
163
164
- pub fn add_callback < F : FnMut ( T ) -> ( ) + ' a > (
164
+ pub fn add_callback < F : ' a + FnMut ( T ) > (
165
165
& mut self ,
166
166
id : ComputeCellID ,
167
167
callback : F ,
0 commit comments