From 8425099e5ffb6c0c288327b6e111591733ce279a Mon Sep 17 00:00:00 2001 From: "Hatter Jiang@Pixelbook" Date: Sat, 24 Aug 2019 01:07:29 +0800 Subject: [PATCH] match true/false -> if --- src/jdk.rs | 7 ++++--- src/main.rs | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/jdk.rs b/src/jdk.rs index b9d8919..96d0eea 100644 --- a/src/jdk.rs +++ b/src/jdk.rs @@ -33,9 +33,10 @@ pub fn get_java_home(version: &str) -> Option { Some(j) => Some(j), None => match get_local_java_home(version) { Some(j) => Some(j), - None => match get_cloud_java(version) { - true => get_local_java_home(version), - false => None, + None => if get_cloud_java(version) { + get_local_java_home(version) + } else { + None }, }, } diff --git a/src/main.rs b/src/main.rs index 0bb6fd7..492b629 100644 --- a/src/main.rs +++ b/src/main.rs @@ -127,9 +127,10 @@ fn do_with_buildin_arg_builder(first_arg: &str, args: &Vec, builder_name } print_message(MessageType::OK, &format!("BUILDER_HOME = {}", &builder_desc.home)); - let mut new_env = match has_java { - true => get_env_with_java_home(&java_home), - false => get_env(), + let mut new_env = if has_java { + get_env_with_java_home(&java_home) + } else { + get_env() }; for builder_home_name in builder_desc.get_builder_home_name() { new_env.insert(builder_home_name, builder_desc.home.clone());