*Actually* remove async-trait and use AFIT

catuhana · Nov 29, 2023 · 2e9ecbd · 2e9ecbd
1 parent cd6b5fe
commit 2e9ecbd
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.75"
-async-trait = "0.1.74"
 clap = { version = "4.4.10", features = ["derive"] }
 confique = { git = "https://github.com/tuhanayim/confique", rev = "2c85724", default-features = false, features = [
   "toml",

diff --git a/src/platforms/lastfm.rs b/src/platforms/lastfm.rs
@@ -19,7 +19,6 @@ pub struct LastFM {
     pub api_key: String,
 }
 
-#[async_trait::async_trait]
 pub trait LastFMPlatform: Platform {
     const USER_AGENT: &'static str = "reqwest/0.11 [lure]";
     const API_URL: &'static str;
@@ -31,7 +30,6 @@ pub trait LastFMPlatform: Platform {
     ) -> anyhow::Result<()>;
 }
 
-#[async_trait::async_trait]
 impl LastFMPlatform for LastFM {
     const API_URL: &'static str = "https://ws.audioscrobbler.com/2.0";
 
@@ -53,7 +51,6 @@ impl LastFMPlatform for LastFM {
     }
 }
 
-#[async_trait::async_trait]
 impl Platform for LastFM {
     type Platform = Self;
 

diff --git a/src/platforms/listenbrainz.rs b/src/platforms/listenbrainz.rs
@@ -36,7 +36,6 @@ impl ListenBrainz {
     }
 }
 
-#[async_trait::async_trait]
 impl Platform for ListenBrainz {
     type Platform = Self;
 

diff --git a/src/platforms/mod.rs b/src/platforms/mod.rs
@@ -13,7 +13,6 @@ pub struct Status {
     pub idle: Option<String>,
 }
 
-#[async_trait::async_trait]
 pub trait Platform {
     type Platform;
 

diff --git a/src/rive.rs b/src/rive.rs
@@ -4,13 +4,11 @@ use rive_models::{
     user::{FieldsUser, UserStatus},
 };
 
-#[async_trait::async_trait]
 pub trait ClientExt {
     async fn ping(&self) -> anyhow::Result<(), anyhow::Error>;
-    async fn set_status(&self, status: Option<String>) -> ();
+    async fn set_status(&self, status: Option<String>);
 }
 
-#[async_trait::async_trait]
 impl ClientExt for Client {
     async fn ping(&self) -> anyhow::Result<(), anyhow::Error> {
         tracing::debug!("pinging Revolt API");