@@ -558,28 +558,24 @@ impl EventQueue {
558558 . keys ( )
559559 . find ( |scope| !self . in_flight_scopes . contains ( scope) )
560560 . cloned ( ) ;
561- match cancelled_scope {
562- Some ( scope) => {
563- // Move cancelled events into the regular events slot.
564- // No new events to merge — re-dispatch the original batch.
565- let cancelled = self . cancelled_batches . remove ( & scope) . unwrap_or_default ( ) ;
566- let cancel_reason = self . cancel_reasons . remove ( & scope) ;
567- self . in_flight_scopes . insert ( scope. clone ( ) ) ;
568- self . in_flight_deadlines
569- . insert ( scope. clone ( ) , now + self . in_flight_deadline ) ;
570- self . in_flight_batch_sizes
571- . insert ( scope. clone ( ) , cancelled. len ( ) ) ;
572- self . record_in_flight_reply_route ( & scope, & cancelled) ;
573- return Some ( FlushBatch {
574- channel_id : scope. channel_id ( ) ,
575- scope,
576- events : cancelled,
577- cancelled_events : vec ! [ ] ,
578- cancel_reason,
579- } ) ;
580- }
581- None => return None ,
582- }
561+ let scope = cancelled_scope?;
562+ // Move cancelled events into the regular events slot.
563+ // No new events to merge — re-dispatch the original batch.
564+ let cancelled = self . cancelled_batches . remove ( & scope) . unwrap_or_default ( ) ;
565+ let cancel_reason = self . cancel_reasons . remove ( & scope) ;
566+ self . in_flight_scopes . insert ( scope. clone ( ) ) ;
567+ self . in_flight_deadlines
568+ . insert ( scope. clone ( ) , now + self . in_flight_deadline ) ;
569+ self . in_flight_batch_sizes
570+ . insert ( scope. clone ( ) , cancelled. len ( ) ) ;
571+ self . record_in_flight_reply_route ( & scope, & cancelled) ;
572+ return Some ( FlushBatch {
573+ channel_id : scope. channel_id ( ) ,
574+ scope,
575+ events : cancelled,
576+ cancelled_events : vec ! [ ] ,
577+ cancel_reason,
578+ } ) ;
583579 }
584580 } ;
585581 let channel_id = scope. channel_id ( ) ;
@@ -1465,10 +1461,8 @@ pub fn extract_slash_command(content: &str, known_names: &[&str]) -> Option<Stri
14651461 . unwrap_or ( after_at. len ( ) ) ;
14661462 ( len > 0 ) . then_some ( len)
14671463 } ) ;
1468- match name_len {
1469- Some ( len) => rest = after_at[ len..] . trim_start ( ) ,
1470- None => return None , // bare '@' — not a mention
1471- }
1464+ let len = name_len?; // bare '@' — not a mention
1465+ rest = after_at[ len..] . trim_start ( ) ;
14721466 } else {
14731467 break ;
14741468 }
0 commit comments