From 3f1cb85b61c5990f1a32f5903add30bee581a81a Mon Sep 17 00:00:00 2001
From: "Hatter Jiang@Pixelbook" <jht5945@gmail.com>
Date: Sun, 4 Aug 2019 22:56:51 +0800
Subject: [PATCH] match -> unwrap_or_else

---
 src/http.rs | 2 +-
 src/jdk.rs  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/http.rs b/src/http.rs
index 2109f77..5e699c4 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -19,4 +19,4 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
 
 pub fn get_url(url: &str) -> XResult<String> {
     Ok(reqwest::get(url)?.text()?)
-}
\ No newline at end of file
+}
diff --git a/src/jdk.rs b/src/jdk.rs
index cd9116d..fcdf5e5 100644
--- a/src/jdk.rs
+++ b/src/jdk.rs
@@ -127,10 +127,9 @@ pub fn extract_jdk_and_wait(file_name: &str) {
         Err(_) => return,
         Ok(o) => o,
     };
-    match local_util::extract_package_and_wait(&local_java_home_base_dir, file_name) {
-        Err(err) => print_message(MessageType::ERROR, &format!("Extract file: {}, failed: {}", file_name, err)),
-        Ok(_) => (),
-    };
+    local_util::extract_package_and_wait(&local_java_home_base_dir, file_name).unwrap_or_else(|err| {
+        print_message(MessageType::ERROR, &format!("Extract file: {}, failed: {}", file_name, err));
+    });
 }
 
 pub fn get_env() -> HashMap<String, String> {