Simplify match block

rust-lang · Dec 6, 2019 · 0a20521 · 0a20521
1 parent bb77917
commit 0a20521
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/toolchain.rs b/src/toolchain.rs
@@ -125,11 +125,10 @@ impl<'a> Toolchain<'a> {
             (self.cfg.notify_handler)(Notification::InstalledToolchain(&self.name));
         }
 
-        let status = match (updated, previous_version.is_some()) {
-            (true, false) => UpdateStatus::Installed,
-            (true, true) => UpdateStatus::Updated(previous_version.unwrap()),
-            (false, true) => UpdateStatus::Unchanged,
-            (false, false) => UpdateStatus::Unchanged,
+        let status = match (updated, previous_version) {
+            (true, None) => UpdateStatus::Installed,
+            (true, Some(v)) => UpdateStatus::Updated(v),
+            (false, _) => UpdateStatus::Unchanged,
         };
 
         Ok(status)