Merge branch 'development' into feat/track-activate-and-deactivate

Stremio · Sep 5, 2023 · 56e7666 · 56e7666
2 parents f8b9523 + 96636cd
commit 56e7666
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/src/models/ctx/update_profile.rs b/src/models/ctx/update_profile.rs
@@ -98,7 +98,7 @@ pub fn update_profile<E: Env + 'static>(
                 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;
@@ -292,7 +292,7 @@ pub fn update_profile<E: Env + 'static>(
                 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
@@ -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::<Vec<_>>();
     let next_selectable = Selectable {
         types: selectable_types,

diff --git a/src/models/library_with_filters.rs b/src/models/library_with_filters.rs
@@ -241,7 +241,7 @@ fn selectable_update<F: LibraryFilter>(
             .map(|selected| selected.request.r#type.is_none())
             .unwrap_or_default(),
     })
-    .chain(selectable_types.into_iter())
+    .chain(selectable_types)
     .collect::<Vec<_>>();
     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
@@ -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
@@ -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 {