File tree Expand file tree Collapse file tree 3 files changed +6
-15
lines changed Expand file tree Collapse file tree 3 files changed +6
-15
lines changed Original file line number Diff line number Diff line change @@ -550,7 +550,7 @@ impl<S: Storage> Actor<S> {
550
550
self . tasks . spawn_local ( async move {
551
551
let mut stream = store. entries ( ) . subscribe_area ( namespace, area, params) ;
552
552
while let Some ( event) = stream. next ( ) . await {
553
- if let Err ( _ ) = sender. send ( event) . await {
553
+ if sender. send ( event) . await . is_err ( ) {
554
554
break ;
555
555
}
556
556
}
@@ -571,7 +571,7 @@ impl<S: Storage> Actor<S> {
571
571
. entries ( )
572
572
. resume_subscription ( progress_id, namespace, area, params) ;
573
573
while let Some ( event) = stream. next ( ) . await {
574
- if let Err ( _ ) = sender. send ( event) . await {
574
+ if sender. send ( event) . await . is_err ( ) {
575
575
break ;
576
576
}
577
577
}
Original file line number Diff line number Diff line change @@ -335,7 +335,7 @@ impl traits::EntryStorage for Rc<RefCell<EntryStore>> {
335
335
params,
336
336
namespace,
337
337
progress_id,
338
- store : Rc :: downgrade ( & self ) ,
338
+ store : Rc :: downgrade ( self ) ,
339
339
}
340
340
}
341
341
@@ -351,7 +351,7 @@ impl traits::EntryStorage for Rc<RefCell<EntryStore>> {
351
351
params,
352
352
progress_id,
353
353
namespace,
354
- store : Rc :: downgrade ( & self ) ,
354
+ store : Rc :: downgrade ( self ) ,
355
355
}
356
356
}
357
357
}
Original file line number Diff line number Diff line change @@ -255,14 +255,9 @@ impl StoreEvent {
255
255
&& params. includes_origin ( origin)
256
256
}
257
257
StoreEvent :: Pruned ( _, PruneEvent { pruned, by : _ } ) => {
258
- if !params. ingest_only
258
+ !params. ingest_only
259
259
&& * pruned. entry ( ) . namespace_id ( ) == namespace_id
260
260
&& area. includes_entry ( pruned. entry ( ) )
261
- {
262
- true
263
- } else {
264
- false
265
- }
266
261
}
267
262
}
268
263
}
@@ -328,11 +323,7 @@ impl SubscribeParams {
328
323
}
329
324
330
325
pub fn includes_entry ( & self , entry : & Entry ) -> bool {
331
- if self . ignore_empty_payloads && entry. payload_length ( ) == 0 {
332
- false
333
- } else {
334
- true
335
- }
326
+ !( self . ignore_empty_payloads && entry. payload_length ( ) == 0 )
336
327
}
337
328
338
329
pub fn includes_origin ( & self , origin : & EntryOrigin ) -> bool {
You can’t perform that action at this time.
0 commit comments