From 96636cd5333f37b5d1b0fdd15275e4e70a3a7420 Mon Sep 17 00:00:00 2001 From: Lachezar Lechev Date: Tue, 5 Sep 2023 12:26:02 +0300 Subject: [PATCH] fix: clippy warnings & rustfmt Signed-off-by: Lachezar Lechev --- src/models/ctx/update_profile.rs | 4 ++-- src/models/installed_addons_with_filters.rs | 2 +- src/models/library_with_filters.rs | 2 +- src/unit_tests/serde/library_bucket_ref.rs | 2 +- src/unit_tests/serde/success_response.rs | 4 +--- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/models/ctx/update_profile.rs b/src/models/ctx/update_profile.rs index 0211b9982..21f890fec 100644 --- a/src/models/ctx/update_profile.rs +++ b/src/models/ctx/update_profile.rs @@ -98,7 +98,7 @@ pub fn update_profile( let removed_transport_urls = &prev_transport_urls - &next_transport_urls; let transport_urls = added_transport_urls .into_iter() - .chain(removed_transport_urls.into_iter()) + .chain(removed_transport_urls) .collect(); if profile.addons != next_addons { profile.addons = next_addons; @@ -286,7 +286,7 @@ pub fn update_profile( let removed_transport_urls = &prev_transport_urls - &next_transport_urls; let transport_urls = added_transport_urls .into_iter() - .chain(removed_transport_urls.into_iter()) + .chain(removed_transport_urls) .collect(); if profile.addons != *addons { profile.addons = addons.to_owned(); diff --git a/src/models/installed_addons_with_filters.rs b/src/models/installed_addons_with_filters.rs index 13dfa9d65..4a178e9b4 100644 --- a/src/models/installed_addons_with_filters.rs +++ b/src/models/installed_addons_with_filters.rs @@ -121,7 +121,7 @@ fn selectable_update( .map(|selected| selected.request.r#type.is_none()) .unwrap_or_default(), }) - .chain(selectable_types.into_iter()) + .chain(selectable_types) .collect::>(); let next_selectable = Selectable { types: selectable_types, diff --git a/src/models/library_with_filters.rs b/src/models/library_with_filters.rs index aae3c000c..4a51a5c0c 100644 --- a/src/models/library_with_filters.rs +++ b/src/models/library_with_filters.rs @@ -241,7 +241,7 @@ fn selectable_update( .map(|selected| selected.request.r#type.is_none()) .unwrap_or_default(), }) - .chain(selectable_types.into_iter()) + .chain(selectable_types) .collect::>(); let selectable_sorts = Sort::iter() .map(|sort| SelectableSort { diff --git a/src/unit_tests/serde/library_bucket_ref.rs b/src/unit_tests/serde/library_bucket_ref.rs index 46d898507..4c404e47a 100644 --- a/src/unit_tests/serde/library_bucket_ref.rs +++ b/src/unit_tests/serde/library_bucket_ref.rs @@ -6,7 +6,7 @@ fn library_bucket_ref() { assert_ser_tokens( &LibraryBucketRef { uid: &Some("uid".to_owned()), - items: vec![].iter().cloned().collect(), + items: [].iter().cloned().collect(), }, &[ Token::Struct { diff --git a/src/unit_tests/serde/success_response.rs b/src/unit_tests/serde/success_response.rs index b584cd73c..f276d8169 100644 --- a/src/unit_tests/serde/success_response.rs +++ b/src/unit_tests/serde/success_response.rs @@ -6,9 +6,7 @@ use serde_test::{assert_ser_tokens, Token}; #[test] fn success_response() { assert_ser_tokens( - &SuccessResponse { - success: True::default(), - }, + &SuccessResponse { success: True }, &[ vec![ Token::Struct {