chore: replace ToString impl with Display

andrey-yantsen · Mar 3, 2024 · 1acdcb8 · 1acdcb8
1 parent 19fd161
commit 1acdcb8
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 33 deletions.
diff --git a/crates/plex-api/src/media_container/preferences/mod.rs b/crates/plex-api/src/media_container/preferences/mod.rs
@@ -1,5 +1,7 @@
 mod deserializer;
 
+use std::fmt::Display;
+
 use super::MediaContainer;
 use serde::Deserialize;
 
@@ -36,13 +38,13 @@ pub enum Value {
     Double(f64),
 }
 
-impl ToString for Value {
-    fn to_string(&self) -> String {
+impl Display for Value {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Value::Text(s) => s.to_owned(),
-            Value::Int(i) => i.to_string(),
-            Value::Bool(b) => (if *b { "1" } else { "0" }).to_owned(),
-            Value::Double(d) => d.to_string(),
+            Value::Text(s) => write!(f, "{}", s),
+            Value::Int(i) => write!(f, "{}", i),
+            Value::Bool(b) => write!(f, "{}", if *b { "1" } else { "0" }),
+            Value::Double(d) => write!(f, "{}", d),
         }
     }
 }

diff --git a/crates/plex-api/src/myplex/claim_token.rs b/crates/plex-api/src/myplex/claim_token.rs
@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use crate::{http_client::HttpClient, url::MYPLEX_CLAIM_TOKEN_PATH, Error, Result};
 use http::StatusCode;
 use isahc::AsyncReadResponseExt;
@@ -52,8 +54,8 @@ impl ClaimToken {
     }
 }
 
-impl ToString for ClaimToken {
-    fn to_string(&self) -> String {
-        self.token.clone()
+impl Display for ClaimToken {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.token)
     }
 }
diff --git a/crates/plex-api/src/myplex/sharing/filter.rs b/crates/plex-api/src/myplex/sharing/filter.rs
@@ -3,7 +3,7 @@ use serde::{
     Deserialize, Serialize,
 };
 use std::{
-    fmt::{Formatter, Result as FmtResult},
+    fmt::{Display, Formatter, Result as FmtResult},
     result::Result as StdResult,
 };
 
@@ -93,8 +93,8 @@ impl Serialize for SharingFilter {
     }
 }
 
-impl ToString for SharingFilter {
-    fn to_string(&self) -> String {
+impl Display for SharingFilter {
+    fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
         let mut ret: Vec<String> = vec![];
 
         if !self.content_rating.is_empty() {
@@ -116,6 +116,6 @@ impl ToString for SharingFilter {
             ret.push(format!("label!={}", self.exclude_label.join("%2C")))
         }
 
-        ret.join("|")
+        write!(f, "{}", ret.join("|"))
     }
 }
diff --git a/crates/plex-api/src/server/transcode.rs b/crates/plex-api/src/server/transcode.rs
@@ -151,9 +151,9 @@ impl ProfileSetting {
     }
 }
 
-impl ToString for ProfileSetting {
-    fn to_string(&self) -> String {
-        format!("{}({})", self.setting, self.params.join("&"))
+impl Display for ProfileSetting {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}({})", self.setting, self.params.join("&"))
     }
 }
 
@@ -173,16 +173,20 @@ pub enum VideoSetting {
     FrameRate,
 }
 
-impl ToString for VideoSetting {
-    fn to_string(&self) -> String {
-        match self {
-            VideoSetting::Width => "video.width".to_string(),
-            VideoSetting::Height => "video.height".to_string(),
-            VideoSetting::BitDepth => "video.bitDepth".to_string(),
-            VideoSetting::Level => "video.level".to_string(),
-            VideoSetting::Profile => "video.profile".to_string(),
-            VideoSetting::FrameRate => "video.frameRate".to_string(),
-        }
+impl Display for VideoSetting {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                VideoSetting::Width => "video.width",
+                VideoSetting::Height => "video.height",
+                VideoSetting::BitDepth => "video.bitDepth",
+                VideoSetting::Level => "video.level",
+                VideoSetting::Profile => "video.profile",
+                VideoSetting::FrameRate => "video.frameRate",
+            }
+        )
     }
 }
 
@@ -196,13 +200,17 @@ pub enum AudioSetting {
     BitDepth,
 }
 
-impl ToString for AudioSetting {
-    fn to_string(&self) -> String {
-        match self {
-            AudioSetting::Channels => "audio.channels".to_string(),
-            AudioSetting::SamplingRate => "audio.samplingRate".to_string(),
-            AudioSetting::BitDepth => "audio.bitDepth".to_string(),
-        }
+impl Display for AudioSetting {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                AudioSetting::Channels => "audio.channels",
+                AudioSetting::SamplingRate => "audio.samplingRate",
+                AudioSetting::BitDepth => "audio.bitDepth",
+            }
+        )
     }
 }