Merge pull request #633 from Stremio/chore/upgrade-serde_with

chore: upgrade serde_with to 3.5
Stremio · Jan 29, 2024 · 5f22068 · 5f22068
2 parents c3d6885 + 8dc28a7
commit 5f22068
Show file tree

Hide file tree

Showing 12 changed files with 159 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,7 +41,7 @@ serde_json = "1.0.*"
 serde_url_params = "0.2"
 serde_bencode = "0.2.*"
 stremio-serde-hex = "0.1.*" # keep track of https://github.com/fspmarshall/serde-hex/pull/8
-serde_with = { version = "1.14.*", features = ["macros", "chrono"] }
+serde_with = { version = "3.5", features = ["macros", "chrono_0_4"] }
 
 flate2 = "1.0.*"
 futures = "0.3.*"

diff --git a/src/unit_tests/serde/auth.rs b/src/unit_tests/serde/auth.rs
@@ -1,14 +1,15 @@
 use crate::types::profile::{Auth, AuthKey, User};
 use crate::unit_tests::serde::default_tokens_ext::DefaultTokens;
-use serde_test::{assert_tokens, Token};
+use serde_test::{assert_tokens, Configure, Token};
 
 #[test]
 fn auth() {
     assert_tokens(
         &Auth {
             key: AuthKey::default(),
             user: User::default(),
-        },
+        }
+        .compact(),
         &[
             vec![
                 Token::Struct {

diff --git a/src/unit_tests/serde/descriptor.rs b/src/unit_tests/serde/descriptor.rs
@@ -1,16 +1,20 @@
-use crate::types::addon::{Descriptor, DescriptorFlags, Manifest};
-use crate::unit_tests::serde::default_tokens_ext::DefaultTokens;
-use serde_test::{assert_de_tokens, assert_tokens, Token};
+use serde_test::{assert_de_tokens, assert_tokens, Configure, Token};
 use url::Url;
 
+use crate::{
+    types::addon::{Descriptor, DescriptorFlags, Manifest},
+    unit_tests::serde::default_tokens_ext::DefaultTokens,
+};
+
 #[test]
 fn descriptor() {
     assert_tokens(
         &Descriptor {
             manifest: Manifest::default(),
             transport_url: Url::parse("https://transport_url").unwrap(),
             flags: DescriptorFlags::default(),
-        },
+        }
+        .compact(),
         &[
             vec![
                 Token::Struct {
@@ -35,7 +39,8 @@ fn descriptor() {
             manifest: Manifest::default(),
             transport_url: Url::parse("https://transport_url").unwrap(),
             flags: DescriptorFlags::default(),
-        },
+        }
+        .compact(),
         &[
             vec![
                 Token::Struct {

diff --git a/src/unit_tests/serde/descriptor_preview.rs b/src/unit_tests/serde/descriptor_preview.rs
@@ -1,15 +1,19 @@
-use crate::types::addon::{DescriptorPreview, ManifestPreview};
-use crate::unit_tests::serde::default_tokens_ext::DefaultTokens;
-use serde_test::{assert_tokens, Token};
+use serde_test::{assert_tokens, Configure, Token};
 use url::Url;
 
+use crate::{
+    types::addon::{DescriptorPreview, ManifestPreview},
+    unit_tests::serde::default_tokens_ext::DefaultTokens,
+};
+
 #[test]
 fn descriptor_preview() {
     assert_tokens(
         &DescriptorPreview {
             manifest: ManifestPreview::default(),
             transport_url: Url::parse("https://transport_url").unwrap(),
-        },
+        }
+        .compact(),
         &[
             vec![
                 Token::Struct {

diff --git a/src/unit_tests/serde/library_item.rs b/src/unit_tests/serde/library_item.rs
@@ -2,7 +2,7 @@ use crate::types::library::{LibraryItem, LibraryItemState};
 use crate::types::resource::{MetaItemBehaviorHints, PosterShape};
 use crate::unit_tests::serde::default_tokens_ext::DefaultTokens;
 use chrono::{TimeZone, Utc};
-use serde_test::{assert_de_tokens, assert_ser_tokens, Token};
+use serde_test::{assert_de_tokens, assert_ser_tokens, Configure, Token};
 use url::Url;
 
 #[test]
@@ -35,7 +35,8 @@ fn library_item() {
                 state: LibraryItemState::default(),
                 behavior_hints: MetaItemBehaviorHints::default(),
             },
-        ],
+        ]
+        .readable(),
         &[
             vec![
                 Token::Seq { len: Some(2) },
@@ -172,7 +173,8 @@ fn library_item() {
                 state: LibraryItemState::default(),
                 behavior_hints: MetaItemBehaviorHints::default(),
             },
-        ],
+        ]
+        .readable(),
         &[
             vec![
                 Token::Seq { len: Some(2) },

diff --git a/src/unit_tests/serde/manifest.rs b/src/unit_tests/serde/manifest.rs
@@ -1,7 +1,7 @@
 use crate::types::addon::{Manifest, ManifestBehaviorHints};
 use crate::unit_tests::serde::default_tokens_ext::DefaultTokens;
 use semver::Version;
-use serde_test::{assert_de_tokens, assert_ser_tokens, Token};
+use serde_test::{assert_de_tokens, assert_ser_tokens, Configure, Token};
 use url::Url;
 
 #[test]
@@ -38,7 +38,8 @@ fn manifest() {
                 addon_catalogs: vec![],
                 behavior_hints: ManifestBehaviorHints::default(),
             },
-        ],
+        ]
+        .readable(),
         &[
             vec![
                 Token::Seq { len: Some(2) },
@@ -158,7 +159,8 @@ fn manifest() {
                 addon_catalogs: vec![],
                 behavior_hints: ManifestBehaviorHints::default(),
             },
-        ],
+        ]
+        .readable(),
         &[
             vec![
                 Token::Seq { len: Some(2) },