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

fix clippy

Browse Source
This commit is contained in:
Hatter Jiang
2020-04-12 14:17:42 +08:00
parent 63919d5532
commit 2e70fc3d73
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.rs
View File

@@ -61,29 +61,29 @@ fn process_config_item(options: &Options, config_item: &OSSBackupdConfigItem,
print_message(MessageType::DEBUG, &format!("Process config item index: {}, config: {:?}", item_index, config_item));
}
let encrypt_pubkey_file = config_item.encrypt_pubkey_file.as_ref().ok_or("encrypt_pubkey_file".to_owned())?;
let encrypt_pubkey_file = config_item.encrypt_pubkey_file.as_ref().ok_or_else(|| "encrypt_pubkey_file".to_owned())?;
if options.verbose {
print_message(MessageType::DEBUG, &format!("Encrypt pubkey file: {}", encrypt_pubkey_file));
}
let target = config_item.target.as_ref().ok_or("target".to_owned())?;
let target = config_item.target.as_ref().ok_or_else(|| "target".to_owned())?;
if options.verbose {
print_message(MessageType::DEBUG, &format!("Target file: {}", iff!(target.is_empty(), "<empty>", target)));
}
let oss_config = config_item.oss_config.as_ref().ok_or("oss_config".to_owned())?;
let oss_config = config_item.oss_config.as_ref().ok_or_else(|| "oss_config".to_owned())?;
let endpoint = oss_config.endpoint.as_ref().ok_or("oss_config#endpoint".to_owned())?;
let endpoint = oss_config.endpoint.as_ref().ok_or_else(|| "oss_config#endpoint".to_owned())?;
if options.verbose {
print_message(MessageType::DEBUG, &format!("Endpoint: {}", endpoint));
}
let access_key_id = oss_config.access_key_id.as_ref().ok_or("oss_config#access_key_id".to_owned())?;
let access_key_id = oss_config.access_key_id.as_ref().ok_or_else(|| "oss_config#access_key_id".to_owned())?;
if options.verbose {
print_message(MessageType::DEBUG, &format!("Access key id: {}", access_key_id));
}
let access_key_secret = oss_config.access_key_secret.as_ref().ok_or("oss_config#access_key_secret".to_owned())?;
let access_key_secret = oss_config.access_key_secret.as_ref().ok_or_else(|| "oss_config#access_key_secret".to_owned())?;
let bucket = &oss_config.bucket.as_ref().ok_or("oss_config#bucket".to_owned())?;
let bucket = &oss_config.bucket.as_ref().ok_or_else(|| "oss_config#bucket".to_owned())?;
if options.verbose {
print_message(MessageType::DEBUG, &format!("Bucket: {}", bucket));
}
@@ -118,7 +118,7 @@ fn process_config_item(options: &Options, config_item: &OSSBackupdConfigItem,
let temp_pgp_file = &format!("temp_file_{}.gpg", secs);
let remove_temp_files = || {
for f in vec![temp_zip_file, temp_pgp_file] {
for f in &[temp_zip_file, temp_pgp_file] {
if Path::new(f).is_file() {
if options.verbose {
print_message(MessageType::DEBUG, &format!("Remove file: {}", f));
@@ -211,7 +211,7 @@ fn process_new_backup_file(backup_content_json: &str, new_item: &str, limit: usi
}
// stringify JSON array
fn stringity_json_array(vec: &Vec<String>) -> XResult<String> {
fn stringity_json_array(vec: &[String]) -> XResult<String> {
let mut json_arr = json::JsonValue::new_array();
for v in vec {
json_arr.push(json::JsonValue::from(v.as_str()))?;