chore: remove async-trait

Author: photovoltex

Cargo.lock

@@ -21,7 +21,6 @@ rustls-tls-webpki-roots = ["librespot-core/rustls-tls-webpki-roots"]
 librespot-core = { version = "0.8.0", path = "../core", default-features = false }
 librespot-protocol = { version = "0.8.0", path = "../protocol", default-features = false }
 
-async-trait = "0.1"
 bytes = "1"
 log = "0.4"
 protobuf = "3.7"

metadata/Cargo.toml

@@ -70,7 +70,6 @@ impl Album {
     }
 }
 
-#[async_trait]
 impl Metadata for Album {
     type Message = protocol::metadata::Album;
 

metadata/src/album.rs

@@ -167,7 +167,6 @@ impl Artist {
     }
 }
 
-#[async_trait]
 impl Metadata for Artist {
     type Message = protocol::metadata::Artist;
 

metadata/src/artist.rs

@@ -53,7 +53,6 @@ pub struct Episodes(pub Vec<SpotifyUri>);
 
 impl_deref_wrapped!(Episodes, Vec<SpotifyUri>);
 
-#[async_trait]
 impl Metadata for Episode {
     type Message = protocol::metadata::Episode;
 

metadata/src/episode.rs

@@ -1,10 +1,8 @@
 #[macro_use]
 extern crate log;
 
-#[macro_use]
-extern crate async_trait;
-
 use protobuf::Message;
+use std::future::Future;
 
 use librespot_core::{Error, Session, SpotifyUri};
 
@@ -39,20 +37,34 @@ pub use playlist::Playlist;
 pub use show::Show;
 pub use track::Track;
 
-#[async_trait]
 pub trait Metadata: Send + Sized + 'static {
-    type Message: protobuf::Message + std::fmt::Debug;
+    type Message: Message + std::fmt::Debug;
 
     // Request a protobuf
-    async fn request(session: &Session, id: &SpotifyUri) -> RequestResult;
+    fn request(
+        session: &Session,
+        id: &SpotifyUri,
+    ) -> impl Future<Output = RequestResult> + Send + Sized;
 
     // Request a metadata struct
-    async fn get(session: &Session, id: &SpotifyUri) -> Result<Self, Error> {
-        let response = Self::request(session, id).await?;
-        let msg = Self::Message::parse_from_bytes(&response)?;
-        trace!("Received metadata: {msg:#?}");
-        Self::parse(&msg, id)
+    fn get(
+        session: &Session,
+        id: &SpotifyUri,
+    ) -> impl Future<Output = Result<Self, Error>> + Send + Sized {
+        map_request_to_message(Self::request(session, id), id)
     }
 
     fn parse(msg: &Self::Message, _: &SpotifyUri) -> Result<Self, Error>;
 }
+
+async fn map_request_to_message<M, P, F>(response: F, uri: &SpotifyUri) -> Result<M, Error>
+where
+    P: Message + std::fmt::Debug,
+    M: Metadata<Message = P>,
+    F: Future<Output = RequestResult> + Send + Sized,
+{
+    let response = response.await?;
+    let msg = P::parse_from_bytes(&response)?;
+    trace!("Received metadata: {msg:#?}");
+    M::parse(&msg, uri)
+}

metadata/src/lib.rs

@@ -21,7 +21,6 @@ pub struct PlaylistAnnotation {
     pub abuse_report_state: AbuseReportState,
 }
 
-#[async_trait]
 impl Metadata for PlaylistAnnotation {
     type Message = protocol::playlist_annotate3::PlaylistAnnotation;
 

metadata/src/playlist/annotation.rs

@@ -84,7 +84,6 @@ impl Playlist {
     }
 }
 
-#[async_trait]
 impl Metadata for Playlist {
     type Message = protocol::playlist4_external::SelectedListContent;
 

metadata/src/playlist/list.rs

@@ -6,7 +6,6 @@ use librespot_core::{Error, Session};
 
 pub type RequestResult = Result<bytes::Bytes, Error>;
 
-#[async_trait]
 pub trait MercuryRequest {
     async fn request(session: &Session, uri: &str) -> RequestResult {
         let mut metrics_uri = uri.to_owned();

metadata/src/request.rs

@@ -32,7 +32,6 @@ pub struct Show {
     pub is_audiobook: bool,
 }
 
-#[async_trait]
 impl Metadata for Show {
     type Message = protocol::metadata::Show;