From 13fff9569b19dc4397c48bebf1ca4bb3502d36e1 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Fri, 3 Apr 2020 08:18:16 +0800 Subject: [PATCH] use enumerate --- src/main.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 241c8d2..1195561 100644 --- a/src/main.rs +++ b/src/main.rs @@ -48,10 +48,7 @@ fn main() -> XResult<()> { print_message(MessageType::DEBUG, &format!("OSS backup config: {:?}", &oss_backupd_config)); } - let mut item_index = -1; - for config_item in &oss_backupd_config.items { - item_index += 1; - + for (item_index, config_item) in oss_backupd_config.items.iter().enumerate() { 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)); } @@ -62,7 +59,7 @@ fn main() -> XResult<()> { } 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 { print_message(MessageType::DEBUG, &format!("Process config item index: {}, config: {:?}", item_index, config_item)); }