Simplify using unwrap_or_else

rust-lang · Nov 9, 2020 · e643df0 · e643df0
1 parent 5af00d0
commit e643df0
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs
@@ -869,16 +869,12 @@ impl<'cfg> DrainState<'cfg> {
 
             impl Drop for FinishOnDrop<'_> {
                 fn drop(&mut self) {
-                    if let Some(result) = self.result.take() {
-                        self.messages
-                            .push(Message::Finish(self.id, Artifact::All, result));
-                    } else {
-                        self.messages.push(Message::Finish(
-                            self.id,
-                            Artifact::All,
-                            Err(format_err!("worker panicked")),
-                        ));
-                    }
+                    let result = self
+                        .result
+                        .take()
+                        .unwrap_or_else(|| Err(format_err!("worker panicked")));
+                    self.messages
+                        .push(Message::Finish(self.id, Artifact::All, result));
                 }
             }
         };