From 776e33c04169e3528ea15970aa55aa8d98cbd8ad Mon Sep 17 00:00:00 2001 From: "Hatter Jiang@Pixelbook" Date: Sun, 4 Aug 2019 23:08:00 +0800 Subject: [PATCH] update match --- src/jdk.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/jdk.rs b/src/jdk.rs index a37beb4..8ff08d6 100644 --- a/src/jdk.rs +++ b/src/jdk.rs @@ -57,9 +57,8 @@ pub fn get_cloud_java(version: &str) -> bool { }; for i in 0..cloud_java_names.len() { let cloud_java_name = cloud_java_names[i]; - match tool::get_and_extract_tool_package(&local_java_home_base_dir, false, cloud_java_name, version, false) { - Err(_) => (), - Ok(_) => return true, + if tool::get_and_extract_tool_package(&local_java_home_base_dir, false, cloud_java_name, version, false).is_ok() { + return true; } } print_message(MessageType::ERROR, &format!("Get java failed, version: {}", version)); @@ -73,7 +72,7 @@ pub fn get_macos_java_home(version: &str) -> Option { let output = Command::new(MACOS_LIBEXEC_JAVAHOME).arg("-version").arg(version).output().ok()?; if str::from_utf8(&output.stderr).ok()?.contains("Unable to find any JVMs") { return None; - }; + } Some(str::from_utf8(&output.stdout).ok()?.trim().to_string()) }