From a6ff4a315c70dee6ddafd36228f678e0c0ac24cd Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Mon, 30 Mar 2020 01:01:04 +0800 Subject: [PATCH] ref code --- src/config_util.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/config_util.rs b/src/config_util.rs index 4ddbadb..d433816 100644 --- a/src/config_util.rs +++ b/src/config_util.rs @@ -236,12 +236,12 @@ fn get_config_content(custom_oss_backupd_config: Option<&str>, verbose: bool) -> } let custom_oss_backupd_config_path = Path::new(custom_oss_backupd_config_unrwaped); if custom_oss_backupd_config_path.exists() { - match fs::read_to_string(custom_oss_backupd_config_path) { + return match fs::read_to_string(custom_oss_backupd_config_path) { Err(e) => { print_message(MessageType::ERROR, &format!("Read config file {} error: {}", custom_oss_backupd_config_unrwaped, e)); - return None; + None }, - Ok(o) => return Some(o), + Ok(o) => Some(o), }; } else { print_message(MessageType::ERROR, &format!("Custom config file not found: {}", custom_oss_backupd_config_unrwaped)); @@ -254,12 +254,12 @@ fn get_config_content(custom_oss_backupd_config: Option<&str>, verbose: bool) -> if verbose { print_message(MessageType::DEBUG, &format!("Read config from: {}", OSS_BACKUPD_CONFIG)); } - match fs::read_to_string(oss_backupd_config_path) { + return match fs::read_to_string(oss_backupd_config_path) { Err(e) => { print_message(MessageType::ERROR, &format!("Read config file {} error: {}", OSS_BACKUPD_CONFIG, e)); - return None; + None }, - Ok(o) => return Some(o), + Ok(o) => Some(o), }; } let home_dot_oss_backupd_config = & match get_user_home_dir(DOT_OSS_BACKUPD_CONFIG) { @@ -275,12 +275,12 @@ fn get_config_content(custom_oss_backupd_config: Option<&str>, verbose: bool) -> if verbose { print_message(MessageType::DEBUG, &format!("Read config from: {}", home_dot_oss_backupd_config)); } - match fs::read_to_string(home_dot_oss_backupd_config_path) { + return match fs::read_to_string(home_dot_oss_backupd_config_path) { Err(e) => { print_message(MessageType::ERROR, &format!("Read config file {} error: {}", home_dot_oss_backupd_config, e)); - return None; + None }, - Ok(o) => return Some(o), + Ok(o) => Some(o), }; } } @@ -289,12 +289,12 @@ fn get_config_content(custom_oss_backupd_config: Option<&str>, verbose: bool) -> if verbose { print_message(MessageType::DEBUG, &format!("Read config from: {}", ETC_OSS_BACKUPD_CONFIG)); } - match fs::read_to_string(etc_oss_backupd_config_path) { + return match fs::read_to_string(etc_oss_backupd_config_path) { Err(e) => { print_message(MessageType::ERROR, &format!("Read config file {} error: {}", ETC_OSS_BACKUPD_CONFIG, e)); - return None; + None }, - Ok(o) => return Some(o), + Ok(o) => Some(o), }; }