use if let when able

Co-authored-by: Bruce Guenter <[email protected]>

Author: DominicBurkart

lib/vector-common/src/shutdown.rs

@@ -301,10 +301,10 @@ impl SourceShutdownCoordinator {
     ) -> impl Future<Output = bool> {
         async move {
             let fut = shutdown_complete_tripwire.then(tripwire_handler);
-            if deadline.is_some() {
+            if let Some(deadline) = deadline {
                 // Call `shutdown_force_trigger.disable()` on drop.
                 let shutdown_force_trigger = DisabledTrigger::new(shutdown_force_trigger);
-                if timeout_at(deadline.unwrap(), fut).await.is_ok() {
+                if timeout_at(deadline, fut).await.is_ok() {
                     shutdown_force_trigger.into_inner().disable();
                     true
                 } else {

src/topology/running.rs

@@ -130,13 +130,13 @@ impl RunningTopology {
             .graceful_shutdown_duration
             .map(|grace_period| Instant::now() + grace_period);
 
-        let timeout = if deadline.is_some() {
+        let timeout = if let Some(deadline) = deadline {
             // If we reach the deadline, this future will print out which components
             // won't gracefully shutdown since we will start to forcefully shutdown
             // the sources.
             let mut check_handles2 = check_handles.clone();
             Box::pin(async move {
-                sleep_until(deadline.unwrap()).await;
+                sleep_until(deadline).await;
                 // Remove all tasks that have shutdown.
                 check_handles2.retain(|_key, handles| {
                     retain(handles, |handle| handle.peek().is_none());