From 86b7b8577620d079d8cbb6f5082b8c1f0814f1f6 Mon Sep 17 00:00:00 2001 From: "Hatter Jiang@Pixelbook" Date: Sun, 11 Aug 2019 11:35:54 +0800 Subject: [PATCH] update get_user_home --- src/local_util.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/local_util.rs b/src/local_util.rs index 19795fb..d8ca784 100644 --- a/src/local_util.rs +++ b/src/local_util.rs @@ -81,13 +81,12 @@ pub fn calc_file_sha256(file_name: &str) -> XResult { } pub fn get_user_home() -> XResult { - let home_dir_o = match dirs::home_dir() { - None => return Err(new_box_error("Home dir not found!")), - Some(home_dir_o) => home_dir_o, - }; - match home_dir_o.to_str() { - None => return Err(new_box_error("Home dir not found!")), - Some(home_dir_str) => Ok(home_dir_str.to_string()), + match dirs::home_dir() { + None => Err(new_box_error("Home dir not found!")), + Some(home_dir_o) => match home_dir_o.to_str() { + None => Err(new_box_error("Home dir not found!")), + Some(home_dir_str) => Ok(home_dir_str.to_string()), + }, } }