hatter/oss-backupd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use if let

Browse Source
This commit is contained in:
Hatter Jiang
2020-03-30 01:17:38 +08:00
parent a6ff4a315c
commit 8578ea2c84
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@@ -214,7 +214,7 @@ pub fn process_oss_files(oss_client: &OSSClient, bucket_name: &str, path: &str,
print_message(MessageType::DEBUG, &format!("Read meta file: {}", meta_file_key)); print_message(MessageType::DEBUG, &format!("Read meta file: {}", meta_file_key));
} }
let meta_file_content = match oss_client.get_file_content(bucket_name, meta_file_key)? { let meta_file_content = match oss_client.get_file_content(bucket_name, meta_file_key)? {
None => "[]".to_string(), None => "[]".to_owned(),
Some(c) => c, Some(c) => c,
}; };
if *opt::IS_DEBUG { if *opt::IS_DEBUG {
@@ -259,14 +259,13 @@ pub fn stringity_json_array(vec: &Vec<String>) -> XResult<String> {
// parse JSON array // parse JSON array
pub fn parse_json_array(arr: &str) -> XResult<Vec<String>> { pub fn parse_json_array(arr: &str) -> XResult<Vec<String>> {
let mut vec: Vec<String> = vec![]; let mut vec: Vec<String> = vec![];
if arr != "" { if !arr.is_empty() {
let json_arr = &json::parse(&arr)?; let json_arr = &json::parse(&arr)?;
if json_arr.is_array() { if json_arr.is_array() {
for a in json_arr.members() { for a in json_arr.members() {
match a.as_str() { if let Some(s) = a.as_str() {
None => (), vec.push(s.to_string());
Some(s) => vec.push(s.to_string()), }
};
} }
} }
} }