From 596b9c4d4a02238a7421414b8a8647149c88cb86 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Mon, 13 Nov 2023 13:04:46 +0100 Subject: [PATCH] fix: remove serde_with json feature --- Cargo.toml | 2 +- src/client/response/mod.rs | 4 ++-- src/client/response/player.rs | 14 +++++++------- src/client/response/search.rs | 4 ++-- src/client/response/video_item.rs | 8 ++++---- src/serializer/range.rs | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8e04bb7..a1122fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,8 +44,8 @@ tokio = { version = "1.20.0", features = ["macros", "time"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.82" serde_with = { version = "3.0.0", default-features = false, features = [ + "alloc", "macros", - "json", ] } serde_plain = "1.0.1" rand = "0.8.5" diff --git a/src/client/response/mod.rs b/src/client/response/mod.rs index e914998..237c930 100644 --- a/src/client/response/mod.rs +++ b/src/client/response/mod.rs @@ -54,7 +54,7 @@ use serde::{ de::{IgnoredAny, Visitor}, Deserialize, }; -use serde_with::{json::JsonString, serde_as, VecSkipError}; +use serde_with::{serde_as, DisplayFromStr, VecSkipError}; use crate::error::ExtractionError; use crate::serializer::{text::Text, MapResult, VecSkipErrorWrap}; @@ -202,7 +202,7 @@ pub(crate) struct ResponseContext { #[serde(rename_all = "camelCase")] pub(crate) struct Continuation { /// Number of search results - #[serde_as(as = "Option")] + #[serde_as(as = "Option")] pub estimated_results: Option, #[serde( alias = "onResponseReceivedCommands", diff --git a/src/client/response/player.rs b/src/client/response/player.rs index 0de004d..f3ae15e 100644 --- a/src/client/response/player.rs +++ b/src/client/response/player.rs @@ -2,7 +2,7 @@ use std::ops::Range; use serde::Deserialize; use serde_with::serde_as; -use serde_with::{json::JsonString, DefaultOnError}; +use serde_with::{DefaultOnError, DisplayFromStr}; use super::{ResponseContext, Thumbnails}; use crate::serializer::{text::Text, MapResult}; @@ -78,7 +78,7 @@ pub(crate) struct ErrorMessage { #[derive(Debug, Deserialize)] #[serde(rename_all = "camelCase")] pub(crate) struct StreamingData { - #[serde_as(as = "JsonString")] + #[serde_as(as = "DisplayFromStr")] pub expires_in_seconds: u32, #[serde(default)] pub formats: MapResult>, @@ -106,7 +106,7 @@ pub(crate) struct Format { pub width: Option, pub height: Option, - #[serde_as(as = "Option")] + #[serde_as(as = "Option")] pub approx_duration_ms: Option, #[serde_as(as = "Option")] @@ -114,7 +114,7 @@ pub(crate) struct Format { #[serde_as(as = "Option")] pub init_range: Option>, - #[serde_as(as = "Option")] + #[serde_as(as = "Option")] pub content_length: Option, #[serde(default)] @@ -129,7 +129,7 @@ pub(crate) struct Format { #[serde(default)] #[serde_as(deserialize_as = "DefaultOnError")] pub audio_quality: Option, - #[serde_as(as = "Option")] + #[serde_as(as = "Option")] pub audio_sample_rate: Option, pub audio_channels: Option, pub loudness_db: Option, @@ -237,7 +237,7 @@ pub(crate) struct CaptionTrack { pub(crate) struct VideoDetails { pub video_id: String, pub title: String, - #[serde_as(as = "JsonString")] + #[serde_as(as = "DisplayFromStr")] pub length_seconds: u32, #[serde(default)] pub keywords: Vec, @@ -245,7 +245,7 @@ pub(crate) struct VideoDetails { pub short_description: Option, #[serde(default)] pub thumbnail: Thumbnails, - #[serde_as(as = "JsonString")] + #[serde_as(as = "DisplayFromStr")] pub view_count: u64, pub author: String, pub is_live_content: bool, diff --git a/src/client/response/search.rs b/src/client/response/search.rs index 1eb1e80..8a10080 100644 --- a/src/client/response/search.rs +++ b/src/client/response/search.rs @@ -2,7 +2,7 @@ use serde::{ de::{IgnoredAny, Visitor}, Deserialize, }; -use serde_with::{json::JsonString, serde_as}; +use serde_with::{serde_as, DisplayFromStr}; use super::{video_item::YouTubeListRendererWrap, ResponseContext}; @@ -10,7 +10,7 @@ use super::{video_item::YouTubeListRendererWrap, ResponseContext}; #[derive(Debug, Deserialize)] #[serde(rename_all = "camelCase")] pub(crate) struct Search { - #[serde_as(as = "Option")] + #[serde_as(as = "Option")] pub estimated_results: Option, pub contents: Contents, pub response_context: ResponseContext, diff --git a/src/client/response/video_item.rs b/src/client/response/video_item.rs index 60d6141..a46b0a0 100644 --- a/src/client/response/video_item.rs +++ b/src/client/response/video_item.rs @@ -2,7 +2,7 @@ use once_cell::sync::Lazy; use regex::Regex; use serde::Deserialize; use serde_with::{ - json::JsonString, rust::deserialize_ignore_any, serde_as, DefaultOnError, VecSkipError, + rust::deserialize_ignore_any, serde_as, DefaultOnError, DisplayFromStr, VecSkipError, }; use time::OffsetDateTime; @@ -162,7 +162,7 @@ pub(crate) struct PlaylistVideoRenderer { pub title: String, #[serde(rename = "shortBylineText")] pub channel: TextComponent, - #[serde_as(as = "Option")] + #[serde_as(as = "Option")] pub length_seconds: Option, /// Regular video: `["29K views", " • ", "13 years ago"]` /// Livestream: `["66K", " watching"]` @@ -192,7 +192,7 @@ pub(crate) struct PlaylistRenderer { /// The first item of this list contains the playlist thumbnail, /// subsequent items contain very small thumbnails of the next playlist videos pub thumbnails: Option>, - #[serde_as(as = "Option")] + #[serde_as(as = "Option")] pub video_count: Option, #[serde_as(as = "Option")] pub video_count_short_text: Option, @@ -248,7 +248,7 @@ pub(crate) struct YouTubeListRenderer { #[serde(rename_all = "camelCase")] pub(crate) struct UpcomingEventData { /// Unixtime in seconds - #[serde_as(as = "JsonString")] + #[serde_as(as = "DisplayFromStr")] pub start_time: i64, } diff --git a/src/serializer/range.rs b/src/serializer/range.rs index d05adbd..b61908d 100644 --- a/src/serializer/range.rs +++ b/src/serializer/range.rs @@ -1,12 +1,12 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use serde_with::{json::JsonString, serde_as, DeserializeAs, SerializeAs}; +use serde_with::{serde_as, DeserializeAs, DisplayFromStr, SerializeAs}; #[serde_as] #[derive(Deserialize, Serialize)] pub struct Range { - #[serde_as(as = "JsonString")] + #[serde_as(as = "DisplayFromStr")] start: u32, - #[serde_as(as = "JsonString")] + #[serde_as(as = "DisplayFromStr")] end: u32, }