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 @@ -541,7 +541,7 @@ impl<S: Storage> Actor<S> {
541541 self . tasks . spawn_local ( async move {
542542 let mut stream = store. entries ( ) . subscribe_area ( namespace, area, params) ;
543543 while let Some ( event) = stream. next ( ) . await {
544- if let Err ( _ ) = sender. send ( event) . await {
544+ if sender. send ( event) . await . is_err ( ) {
545545 break ;
546546 }
547547 }
@@ -562,7 +562,7 @@ impl<S: Storage> Actor<S> {
562562 . entries ( )
563563 . resume_subscription ( progress_id, namespace, area, params) ;
564564 while let Some ( event) = stream. next ( ) . await {
565- if let Err ( _ ) = sender. send ( event) . await {
565+ if sender. send ( event) . await . is_err ( ) {
566566 break ;
567567 }
568568 }
Original file line number Diff line number Diff line change @@ -335,7 +335,7 @@ impl traits::EntryStorage for Rc<RefCell<EntryStore>> {
335335 params,
336336 namespace,
337337 progress_id,
338- store : Rc :: downgrade ( & self ) ,
338+ store : Rc :: downgrade ( self ) ,
339339 }
340340 }
341341
@@ -351,7 +351,7 @@ impl traits::EntryStorage for Rc<RefCell<EntryStore>> {
351351 params,
352352 progress_id,
353353 namespace,
354- store : Rc :: downgrade ( & self ) ,
354+ store : Rc :: downgrade ( self ) ,
355355 }
356356 }
357357}
Original file line number Diff line number Diff line change @@ -255,14 +255,9 @@ impl StoreEvent {
255255 && params. includes_origin ( origin)
256256 }
257257 StoreEvent :: Pruned ( _, PruneEvent { pruned, by : _ } ) => {
258- if !params. ingest_only
258+ !params. ingest_only
259259 && * pruned. entry ( ) . namespace_id ( ) == namespace_id
260260 && area. includes_entry ( pruned. entry ( ) )
261- {
262- true
263- } else {
264- false
265- }
266261 }
267262 }
268263 }
@@ -328,11 +323,7 @@ impl SubscribeParams {
328323 }
329324
330325 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 )
336327 }
337328
338329 pub fn includes_origin ( & self , origin : & EntryOrigin ) -> bool {
You can’t perform that action at this time.
0 commit comments