From 3bb756a3b0c98c5cd9a89e6068a9ead72ae26cf0 Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Sun, 28 May 2023 03:01:07 +0200 Subject: [PATCH] Refactor --- src/bots/approved_bot/modules/random.rs | 1 - src/bots/approved_bot/modules/settings.rs | 2 +- src/bots/approved_bot/services/book_library/types.rs | 12 ++++-------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/bots/approved_bot/modules/random.rs b/src/bots/approved_bot/modules/random.rs index 29a19ee..eccf2a4 100644 --- a/src/bots/approved_bot/modules/random.rs +++ b/src/bots/approved_bot/modules/random.rs @@ -198,7 +198,6 @@ async fn get_genre_metas_handler(cq: CallbackQuery, bot: CacheMe>) let keyboard = InlineKeyboardMarkup { inline_keyboard: genre_metas - .clone() .into_iter() .enumerate() .map(|(index, genre_meta)| { diff --git a/src/bots/approved_bot/modules/settings.rs b/src/bots/approved_bot/modules/settings.rs index 8b1096c..31d5eb1 100644 --- a/src/bots/approved_bot/modules/settings.rs +++ b/src/bots/approved_bot/modules/settings.rs @@ -134,7 +134,7 @@ async fn settings_callback_handler( let allowed_langs = get_user_or_default_lang_codes(user.id, user_langs_cache.clone()).await; let mut allowed_langs_set: HashSet = HashSet::new(); - allowed_langs.clone().into_iter().for_each(|v| { + allowed_langs.into_iter().for_each(|v| { allowed_langs_set.insert(v); }); diff --git a/src/bots/approved_bot/services/book_library/types.rs b/src/bots/approved_bot/services/book_library/types.rs index e5822c0..ed3aff1 100644 --- a/src/bots/approved_bot/services/book_library/types.rs +++ b/src/bots/approved_bot/services/book_library/types.rs @@ -84,15 +84,13 @@ where let item_size: usize = (max_size - separator_len * items_count) / items_count; let format_result: Vec = self.items - .clone() - .into_iter() + .iter() .map(|item| item.format(item_size)) .collect(); let has_any_spliced = { format_result - .clone() - .into_iter() + .iter() .any(|item| item.current_size != item.max_size) }; @@ -105,15 +103,13 @@ where } let mut free_symbols: usize = format_result - .clone() - .into_iter() + .iter() .filter(|item| item.current_size == item.max_size) .map(|item| item_size - item.current_size) .sum(); self.items - .clone() - .into_iter() + .iter() .enumerate() .map(|(index, item)| { let already_formated_result = &format_result[index];