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

use enumerate

Browse Source
This commit is contained in:
Hatter Jiang
2020-04-03 08:18:16 +08:00
parent ab3e69997b
commit 13fff9569b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.rs
View File

@@ -48,10 +48,7 @@ fn main() -> XResult<()> {
print_message(MessageType::DEBUG, &format!("OSS backup config: {:?}", &oss_backupd_config)); print_message(MessageType::DEBUG, &format!("OSS backup config: {:?}", &oss_backupd_config));
} }
let mut item_index = -1; for (item_index, config_item) in oss_backupd_config.items.iter().enumerate() {
for config_item in &oss_backupd_config.items {
item_index += 1;
if let Err(e) = process_config_item(&options, &config_item, &oss_backupd_config, item_index) { if let Err(e) = process_config_item(&options, &config_item, &oss_backupd_config, item_index) {
print_message(MessageType::ERROR, &format!("Config {} not found, at item index: {}", e, item_index)); print_message(MessageType::ERROR, &format!("Config {} not found, at item index: {}", e, item_index));
} }
@@ -62,7 +59,7 @@ fn main() -> XResult<()> {
} }
fn process_config_item(options: &Options, config_item: &OSSBackupdConfigItem, fn process_config_item(options: &Options, config_item: &OSSBackupdConfigItem,
oss_backupd_config :&OSSBackupdConfig, item_index: i32) -> Result<(), String> { oss_backupd_config :&OSSBackupdConfig, item_index: usize) -> Result<(), String> {
if options.verbose { if options.verbose {
print_message(MessageType::DEBUG, &format!("Process config item index: {}, config: {:?}", item_index, config_item)); print_message(MessageType::DEBUG, &format!("Process config item index: {}, config: {:?}", item_index, config_item));
} }