Merge pull request #683 from Stremio/fix/clippy-warnings

fix(linting): clippy warnings & rustfmt

src/models/catalog_with_filters.rs

@@ -16,7 +16,6 @@ use boolinator::Boolinator;
 use derivative::Derivative;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use std::convert::TryFrom;
 use std::ops::Add;
 
 #[derive(PartialEq, Eq)]

src/models/link.rs

@@ -10,7 +10,6 @@ use derive_more::From;
 use enclose::enclose;
 use futures::{future, FutureExt, TryFutureExt};
 use serde::Serialize;
-use std::convert::TryFrom;
 use std::fmt;
 
 #[derive(Clone, PartialEq, From, Serialize, Debug)]

src/models/local_search.rs

@@ -340,8 +340,6 @@ mod imdb_rating {
 
 #[cfg(test)]
 mod test {
-    use std::convert::TryFrom;
-
     use super::*;
 
     #[test]

src/unit_tests/ctx/notifications/update_notifications.rs

@@ -278,11 +278,11 @@ fn test_pull_notifications_and_play_in_player() {
 
     assert_eq!(2, meta_notifs.len(), "Should have 2 video notifications");
     assert!(
-        meta_notifs.get("tt1:1:6").is_some(),
+        meta_notifs.contains_key("tt1:1:6"),
         "Should have notification for tt1:1:6"
     );
     assert!(
-        meta_notifs.get("tt1:1:7").is_some(),
+        meta_notifs.contains_key("tt1:1:7"),
         "Should have notification for tt1:1:7"
     );
     // Start watching episode 6
@@ -334,14 +334,13 @@ fn test_pull_notifications_and_play_in_player() {
     });
 
     assert!(
-        runtime
+        !runtime
             .model()
             .unwrap()
             .ctx
             .notifications
             .items
-            .get("tt1")
-            .is_none(),
+            .contains_key("tt1"),
         "All notifications for this MetaItem should be now dismissed"
     );
     // before pulling notifications, make sure to update the last_updated time

src/unit_tests/ctx/update_search_history.rs

@@ -85,8 +85,7 @@ fn test_search_history_update() {
                 serde_json::from_str::<SearchHistoryBucket>(data)
                     .unwrap()
                     .items
-                    .get(query)
-                    .is_some()
+                    .contains_key(query)
             }),
         "Should have stored updated search history"
     );

src/unit_tests/deep_links/addons_deep_links.rs

@@ -1,14 +1,13 @@
 use crate::deep_links::AddonsDeepLinks;
 use crate::models::installed_addons_with_filters::InstalledAddonsRequest;
 use crate::types::addon::{ResourcePath, ResourceRequest};
-use std::convert::TryFrom;
 use std::str::FromStr;
 use url::Url;
 
 #[test]
 fn addons_deep_links_installed_addons_request_no_type() {
     let request = InstalledAddonsRequest { r#type: None };
-    let adl = AddonsDeepLinks::try_from(&request).unwrap();
+    let adl = AddonsDeepLinks::from(&request);
     assert_eq!(adl.addons, "stremio:///addons".to_string());
 }
 
@@ -17,7 +16,7 @@ fn addons_deep_links_installed_addons_request_type() {
     let request = InstalledAddonsRequest {
         r#type: Some("movie".to_string()),
     };
-    let adl = AddonsDeepLinks::try_from(&request).unwrap();
+    let adl = AddonsDeepLinks::from(&request);
     assert_eq!(adl.addons, "stremio:///addons/movie".to_string());
 }
 
@@ -27,7 +26,7 @@ fn addons_deep_links_request() {
         base: Url::from_str("http://v3-cinemeta.strem.io").unwrap(),
         path: ResourcePath::without_extra("addons", "movie", "com.linvo.cinemeta"),
     };
-    let adl = AddonsDeepLinks::try_from(&request).unwrap();
+    let adl = AddonsDeepLinks::from(&request);
     assert_eq!(
         adl.addons,
         "stremio:///addons/movie/http%3A%2F%2Fv3-cinemeta.strem.io%2F/com.linvo.cinemeta"

src/unit_tests/deep_links/discover_deep_links.rs

@@ -1,6 +1,5 @@
 use crate::deep_links::DiscoverDeepLinks;
 use crate::types::addon::{ResourcePath, ResourceRequest};
-use std::convert::TryFrom;
 use std::str::FromStr;
 use url::Url;
 
@@ -10,7 +9,7 @@ fn discover_deep_links() {
         base: Url::from_str("http://domain.root").unwrap(),
         path: ResourcePath::without_extra("meta", "movie", "tt1254207"),
     };
-    let ddl = DiscoverDeepLinks::try_from(&request).unwrap();
+    let ddl = DiscoverDeepLinks::from(&request);
     assert_eq!(
         ddl.discover,
         "stremio:///discover/http%3A%2F%2Fdomain.root%2F/movie/tt1254207?".to_string()

src/unit_tests/deep_links/external_player_link.rs

@@ -4,7 +4,6 @@ use crate::types::profile::Settings;
 use crate::types::resource::{Stream, StreamSource};
 use base64::Engine;
 use percent_encoding::utf8_percent_encode;
-use std::convert::TryFrom;
 use std::str::FromStr;
 use url::Url;
 
@@ -27,7 +26,7 @@ fn external_player_link_magnet() {
     };
     let streaming_server_url = Some(Url::parse(STREAMING_SERVER_URL).unwrap());
     let settings = Settings::default();
-    let epl = ExternalPlayerLink::try_from((&stream, &streaming_server_url, &settings)).unwrap();
+    let epl = ExternalPlayerLink::from((&stream, &streaming_server_url, &settings));
     assert_eq!(epl.download, Some(MAGNET_STR_URL.to_owned()));
     assert_eq!(epl.file_name, None);
 }
@@ -46,7 +45,7 @@ fn external_player_link_http() {
     };
     let streaming_server_url = Some(Url::parse(STREAMING_SERVER_URL).unwrap());
     let settings = Settings::default();
-    let epl = ExternalPlayerLink::try_from((&stream, &streaming_server_url, &settings)).unwrap();
+    let epl = ExternalPlayerLink::from((&stream, &streaming_server_url, &settings));
     assert_eq!(epl.playlist, Some(BASE64_HTTP_URL.to_owned()));
     assert_eq!(epl.file_name, Some("playlist.m3u".to_string()));
 }
@@ -74,7 +73,7 @@ fn external_player_link_torrent() {
     };
     let streaming_server_url = Some(Url::parse(STREAMING_SERVER_URL).unwrap());
     let settings = Settings::default();
-    let epl = ExternalPlayerLink::try_from((&stream, &streaming_server_url, &settings)).unwrap();
+    let epl = ExternalPlayerLink::from((&stream, &streaming_server_url, &settings));
     assert_eq!(
         epl.playlist,
         Some(format!(
@@ -115,7 +114,7 @@ fn external_player_link_external() {
     };
     let streaming_server_url = Some(Url::parse(STREAMING_SERVER_URL).unwrap());
     let settings = Settings::default();
-    let epl = ExternalPlayerLink::try_from((&stream, &streaming_server_url, &settings)).unwrap();
+    let epl = ExternalPlayerLink::from((&stream, &streaming_server_url, &settings));
     assert_eq!(epl.web, Some(Url::from_str(HTTP_STR_URL).unwrap()));
     assert_eq!(epl.file_name, None);
 }
@@ -135,7 +134,7 @@ fn external_player_link_youtube() {
     };
     let streaming_server_url = Some(Url::parse(STREAMING_SERVER_URL).unwrap());
     let settings = Settings::default();
-    let epl = ExternalPlayerLink::try_from((&stream, &streaming_server_url, &settings)).unwrap();
+    let epl = ExternalPlayerLink::from((&stream, &streaming_server_url, &settings));
     assert_eq!(
         epl.playlist,
         Some(format!(
@@ -163,7 +162,7 @@ fn external_player_link_player_frame() {
     };
     let streaming_server_url = Some(Url::parse(STREAMING_SERVER_URL).unwrap());
     let settings = Settings::default();
-    let epl = ExternalPlayerLink::try_from((&stream, &streaming_server_url, &settings)).unwrap();
+    let epl = ExternalPlayerLink::from((&stream, &streaming_server_url, &settings));
     assert_eq!(epl.playlist, None);
     assert_eq!(epl.file_name, None);
 }

src/unit_tests/deep_links/library_deep_links.rs

@@ -1,11 +1,10 @@
 use crate::deep_links::LibraryDeepLinks;
 use crate::models::library_with_filters::{LibraryRequest, Sort};
-use std::convert::TryFrom;
 
 #[test]
 fn library_deep_links_string() {
     let root = "library".to_string();
-    let ldl = LibraryDeepLinks::try_from(&root).unwrap();
+    let ldl = LibraryDeepLinks::from(&root);
     assert_eq!(ldl.library, "stremio:///library".to_string());
 }
 
@@ -17,7 +16,7 @@ fn library_deep_links_request_type() {
         sort: Sort::LastWatched,
         page: Default::default(),
     };
-    let ldl = LibraryDeepLinks::try_from((&root, &request)).unwrap();
+    let ldl = LibraryDeepLinks::from((&root, &request));
     assert_eq!(
         ldl.library,
         "stremio:///library/movie?sort=lastwatched".to_string()
@@ -32,7 +31,7 @@ fn library_deep_links_request_no_type() {
         sort: Sort::LastWatched,
         page: Default::default(),
     };
-    let ldl = LibraryDeepLinks::try_from((&root, &request)).unwrap();
+    let ldl = LibraryDeepLinks::from((&root, &request));
     assert_eq!(
         ldl.library,
         "stremio:///library?sort=lastwatched".to_string()

src/unit_tests/deep_links/library_item_deep_links.rs

@@ -16,14 +16,12 @@ use crate::types::streams::StreamsItem;
 
 const META_DETAILS_VIDEOS: &str = "stremio:///detail/series/tt13622776";
 
-const INFUSE_PLAYER_SETTINGS: Lazy<Settings> = Lazy::new(|| {
-    let mut settings = Settings::default();
-    settings.player_type = Some("infuse".to_owned());
-
-    settings
+static INFUSE_PLAYER_SETTINGS: Lazy<Settings> = Lazy::new(|| Settings {
+    player_type: Some("infuse".to_owned()),
+    ..Settings::default()
 });
 
-const TORRENT_STREAMS_ITEM: Lazy<StreamsItem> = Lazy::new(|| {
+static TORRENT_STREAMS_ITEM: Lazy<StreamsItem> = Lazy::new(|| {
     let stream = Stream {
         source: StreamSource::Torrent {
             info_hash: SerHex::<Strict>::from_hex("df2c94aec35f97943c4e432f25081b590cd35326")
@@ -81,13 +79,12 @@ fn library_item_deep_links_no_video() {
         },
         behavior_hints: Default::default(),
     };
-    let lidl = LibraryItemDeepLinks::try_from((
+    let lidl = LibraryItemDeepLinks::from((
         &lib_item,
         None,
         Some(&*STREAMING_SERVER_URL),
         &*INFUSE_PLAYER_SETTINGS,
-    ))
-    .unwrap();
+    ));
     assert_eq!(
         lidl.meta_details_videos,
         Some(META_DETAILS_VIDEOS.to_string())
@@ -130,14 +127,13 @@ fn library_item_deep_links_state_video_id_no_time_offset_infuse_player() {
         },
         behavior_hints: Default::default(),
     };
-    let lidl = LibraryItemDeepLinks::try_from((
+    let lidl = LibraryItemDeepLinks::from((
         &lib_item,
         // We have a video so we can have a Stream pulled from the StreamBucket!
         Some(&*TORRENT_STREAMS_ITEM),
         Some(&*STREAMING_SERVER_URL),
         &*INFUSE_PLAYER_SETTINGS,
-    ))
-    .unwrap();
+    ));
     assert_eq!(
         lidl.meta_details_videos,
         Some(META_DETAILS_VIDEOS.to_string())
@@ -184,14 +180,13 @@ fn library_item_deep_links_state_video_id() {
         },
         behavior_hints: Default::default(),
     };
-    let lidl = LibraryItemDeepLinks::try_from((
+    let lidl = LibraryItemDeepLinks::from((
         &lib_item,
         // We have a video so we can have a Stream pulled from the StreamBucket!
         Some(&*TORRENT_STREAMS_ITEM),
         Some(&*STREAMING_SERVER_URL),
         &*INFUSE_PLAYER_SETTINGS,
-    ))
-    .unwrap();
+    ));
     assert_eq!(
         lidl.meta_details_videos,
         Some(META_DETAILS_VIDEOS.to_string())
@@ -241,14 +236,13 @@ fn library_item_deep_links_behavior_hints_default_video_id() {
             other: Default::default(),
         },
     };
-    let lidl = LibraryItemDeepLinks::try_from((
+    let lidl = LibraryItemDeepLinks::from((
         &lib_item,
         // We have a video so we can have a Stream pulled from the StreamBucket!
         Some(&*TORRENT_STREAMS_ITEM),
         Some(&*STREAMING_SERVER_URL),
         &*INFUSE_PLAYER_SETTINGS,
-    ))
-    .unwrap();
+    ));
     assert_eq!(lidl.meta_details_videos, None);
     assert_eq!(
         lidl.meta_details_streams,
@@ -298,14 +292,13 @@ fn library_item_deep_links_state_and_behavior_hints_default_video_id() {
             other: Default::default(),
         },
     };
-    let lidl = LibraryItemDeepLinks::try_from((
+    let lidl = LibraryItemDeepLinks::from((
         &lib_item,
         // We have a video so we can have a Stream pulled from the StreamBucket!
         Some(&*TORRENT_STREAMS_ITEM),
         Some(&*STREAMING_SERVER_URL),
         &*INFUSE_PLAYER_SETTINGS,
-    ))
-    .unwrap();
+    ));
     assert_eq!(lidl.meta_details_videos, None);
     assert_eq!(
         lidl.meta_details_streams,
@@ -355,14 +348,13 @@ fn library_item_deep_links_state_no_time_offset_and_behavior_hints_default_video
             other: Default::default(),
         },
     };
-    let lidl = LibraryItemDeepLinks::try_from((
+    let lidl = LibraryItemDeepLinks::from((
         &lib_item,
         // We have a video so we can have a Stream pulled from the StreamBucket!
         Some(&*TORRENT_STREAMS_ITEM),
         Some(&*STREAMING_SERVER_URL),
         &*INFUSE_PLAYER_SETTINGS,
-    ))
-    .unwrap();
+    ));
     assert_eq!(lidl.meta_details_videos, None);
     assert_eq!(
         lidl.meta_details_streams,

src/unit_tests/deep_links/meta_item_deep_links.rs

@@ -1,7 +1,6 @@
 use crate::deep_links::MetaItemDeepLinks;
 use crate::types::addon::{ResourcePath, ResourceRequest};
 use crate::types::resource::{MetaItem, MetaItemBehaviorHints, MetaItemPreview, PosterShape};
-use std::convert::TryFrom;
 use std::str::FromStr;
 use url::Url;
 
@@ -32,8 +31,8 @@ fn meta_item_deep_links() {
         path: ResourcePath::without_extra("meta", preview.r#type.as_ref(), preview.id.as_ref()),
     };
 
-    let preview_midl = MetaItemDeepLinks::try_from((&preview, &request)).unwrap();
-    let midl = MetaItemDeepLinks::try_from((&item, &request)).unwrap();
+    let preview_midl = MetaItemDeepLinks::from((&preview, &request));
+    let midl = MetaItemDeepLinks::from((&item, &request));
     assert_eq!(preview_midl, midl);
     assert_eq!(
         midl.meta_details_videos,
@@ -75,8 +74,8 @@ fn meta_item_deep_links_behavior_hints() {
         path: ResourcePath::without_extra("meta", preview.r#type.as_ref(), preview.id.as_ref()),
     };
 
-    let preview_midl = MetaItemDeepLinks::try_from((&preview, &request)).unwrap();
-    let midl = MetaItemDeepLinks::try_from((&item, &request)).unwrap();
+    let preview_midl = MetaItemDeepLinks::from((&preview, &request));
+    let midl = MetaItemDeepLinks::from((&item, &request));
     assert_eq!(preview_midl, midl);
     assert_eq!(midl.meta_details_videos, None);
     assert_eq!(
@@ -118,8 +117,8 @@ fn meta_item_deep_links_behavior_hints_yt_id() {
         path: ResourcePath::without_extra("meta", preview.r#type.as_ref(), preview.id.as_ref()),
     };
 
-    let preview_midl = MetaItemDeepLinks::try_from((&preview, &request)).unwrap();
-    let midl = MetaItemDeepLinks::try_from((&item, &request)).unwrap();
+    let preview_midl = MetaItemDeepLinks::from((&preview, &request));
+    let midl = MetaItemDeepLinks::from((&item, &request));
     assert_eq!(preview_midl, midl);
     assert_eq!(midl.meta_details_videos, None);
     assert_eq!(