Remove async_trait macro in favor of AFIT & RPITIT (#211)

* Use `async fn` in traits * Fix doc tests * Remove more references to async-trait crate * Remove final code reference * Fix docs * Prepare for stable use of RPITIT * Fix compile errors * Remove unnecessary empty lines * Add changelog entry * Fix warning
Restioson · Jan 31, 2024 · c836eb0 · c836eb0
1 parent ee0d93b
commit c836eb0
Show file tree

Hide file tree

Showing 28 changed files with 29 additions and 96 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         toolchain: [
           stable,
           beta,
-          1.60.0 # MSRV
+          1.75.0 # MSRV
         ]
         args: [
           --all-features,

diff --git a/BREAKING-CHANGES.md b/BREAKING-CHANGES.md
@@ -8,6 +8,8 @@
 
 ### Changed
 
+- Remove `async_trait` macro in favor of async functions in traits (AFIT).
+  This bumps xtra's MSRV to `1.75`.
 - `MessageChannel` is now a `struct` that can be constructed from an `Address` via `MessageChannel::new` or using `From`/`Into`.
 - Move event-loop related functions from `Context` to xtra's top-level scope.
   `Context` is now only used within an actor's `Handler`.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -29,7 +29,6 @@ struct Printer {
 
 struct Print(String);
 
-#[async_trait]
 impl Handler<Print> for Printer {
     type Return = ();
 

diff --git a/macros/src/lib.rs b/macros/src/lib.rs
@@ -19,7 +19,6 @@ pub fn actor_derive(input: TokenStream) -> TokenStream {
     };
 
     quote! {
-        #[xtra::prelude::async_trait]
         impl #impl_generics xtra::Actor for #actor_ident #type_generics #where_clause {
             type Stop = ();
 

diff --git a/xtra/Cargo.toml b/xtra/Cargo.toml
@@ -10,10 +10,9 @@ documentation = "https://docs.rs/xtra"
 readme = "README.md"
 keywords = ["async", "actor", "futures", "xtra", "async-await"]
 categories = ["asynchronous", "concurrency"]
-rust-version = "1.60.0"
+rust-version = "1.75.0"
 
 [dependencies]
-async-trait = "0.1.56"
 catty = "0.1.5"
 futures-core = "0.3.21" # alloc is the only default feature and we need it.
 futures-sink = { version = "0.3.21", default-features = false, optional = true }

diff --git a/xtra/benches/throughput.rs b/xtra/benches/throughput.rs
@@ -1,11 +1,9 @@
-use async_trait::async_trait;
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use tokio::runtime::Runtime;
 use xtra::{Actor, Context, Handler, Mailbox};
 
 struct Counter(u64);
 
-#[async_trait]
 impl Actor for Counter {
     type Stop = ();
     async fn stopped(self) {}
@@ -14,7 +12,6 @@ impl Actor for Counter {
 struct IncrementZst;
 struct Finish;
 
-#[async_trait::async_trait]
 impl Handler<IncrementZst> for Counter {
     type Return = ();
 
@@ -23,7 +20,6 @@ impl Handler<IncrementZst> for Counter {
     }
 }
 
-#[async_trait::async_trait]
 impl Handler<Finish> for Counter {
     type Return = u64;
 

diff --git a/xtra/examples/address_sink.rs b/xtra/examples/address_sink.rs
@@ -11,7 +11,6 @@ struct Add(u32);
 
 struct GetSum;
 
-#[async_trait]
 impl Handler<Add> for Accumulator {
     type Return = ();
 
@@ -20,7 +19,6 @@ impl Handler<Add> for Accumulator {
     }
 }
 
-#[async_trait]
 impl Handler<GetSum> for Accumulator {
     type Return = u32;
 

diff --git a/xtra/examples/backpressure.rs b/xtra/examples/backpressure.rs
@@ -5,7 +5,6 @@ struct Greeter;
 
 struct Hello(String);
 
-#[async_trait]
 impl Handler<Hello> for Greeter {
     type Return = ();
 

diff --git a/xtra/examples/basic_async_std.rs b/xtra/examples/basic_async_std.rs
@@ -7,7 +7,6 @@ struct Printer {
 
 struct Print(String);
 
-#[async_trait]
 impl Handler<Print> for Printer {
     type Return = ();
 

diff --git a/xtra/examples/basic_smol.rs b/xtra/examples/basic_smol.rs
@@ -7,7 +7,6 @@ struct Printer {
 
 struct Print(String);
 
-#[async_trait]
 impl Handler<Print> for Printer {
     type Return = ();
 

diff --git a/xtra/examples/basic_tokio.rs b/xtra/examples/basic_tokio.rs
@@ -7,7 +7,6 @@ struct Printer {
 
 struct Print(String);
 
-#[async_trait]
 impl Handler<Print> for Printer {
     type Return = ();
 

diff --git a/xtra/examples/basic_wasm_bindgen/Cargo.toml b/xtra/examples/basic_wasm_bindgen/Cargo.toml
@@ -11,7 +11,6 @@ crate-type = ["cdylib", "rlib"]
 wasm-bindgen = { version = "0.2.81", default-features = false }
 wasm-bindgen-futures = { version = "0.4.13", default-features = false }
 xtra = { path = "../..", features = ["wasm_bindgen", "macros"] }
-async-trait = "0.1"
 
 [dev-dependencies]
 wasm-bindgen-test = { version = "0.3.13", default-features = false }

diff --git a/xtra/examples/basic_wasm_bindgen/src/lib.rs b/xtra/examples/basic_wasm_bindgen/src/lib.rs
@@ -7,7 +7,6 @@ struct Echoer;
 
 struct Echo(String);
 
-#[async_trait]
 impl Handler<Echo> for Echoer {
     type Return = String;
 

diff --git a/xtra/examples/crude_bench.rs b/xtra/examples/crude_bench.rs
@@ -15,7 +15,6 @@ struct Increment;
 struct IncrementWithData(usize);
 struct GetCount;
 
-#[async_trait]
 impl Handler<Increment> for Counter {
     type Return = ();
 
@@ -24,7 +23,6 @@ impl Handler<Increment> for Counter {
     }
 }
 
-#[async_trait]
 impl Handler<IncrementWithData> for Counter {
     type Return = ();
 
@@ -33,7 +31,6 @@ impl Handler<IncrementWithData> for Counter {
     }
 }
 
-#[async_trait]
 impl Handler<GetCount> for Counter {
     type Return = usize;
 
@@ -51,7 +48,6 @@ struct SendTimer {
 
 struct GetTime;
 
-#[async_trait]
 impl Handler<GetTime> for SendTimer {
     type Return = Duration;
 
@@ -65,7 +61,6 @@ struct ReturnTimer;
 
 struct TimeReturn;
 
-#[async_trait]
 impl Handler<TimeReturn> for ReturnTimer {
     type Return = Instant;
 

diff --git a/xtra/examples/custom_event_loop.rs b/xtra/examples/custom_event_loop.rs
@@ -11,7 +11,6 @@ struct Counter {
 
 struct Inc;
 
-#[async_trait]
 impl Handler<Inc> for Counter {
     type Return = ();
 

diff --git a/xtra/examples/interleaved_messages.rs b/xtra/examples/interleaved_messages.rs
@@ -9,7 +9,6 @@ struct ActorA {
     actor_b: Address<ActorB>,
 }
 
-#[async_trait]
 impl Handler<Hello> for ActorA {
     type Return = ();
 
@@ -24,7 +23,6 @@ impl Handler<Hello> for ActorA {
 #[derive(xtra::Actor)]
 struct ActorB;
 
-#[async_trait]
 impl Handler<Initialized> for ActorB {
     type Return = ();
 
@@ -37,7 +35,6 @@ impl Handler<Initialized> for ActorB {
     }
 }
 
-#[async_trait]
 impl Handler<Hello> for ActorB {
     type Return = ();
 

diff --git a/xtra/examples/manual_actor_impl.rs b/xtra/examples/manual_actor_impl.rs
@@ -6,7 +6,7 @@ struct MessageCounter {
 }
 
 // With a manual `Actor` implementation, we can specify a `Stop` type and thus return something from the `stopped` lifecycle callback.
-#[async_trait]
+
 impl Actor for MessageCounter {
     type Stop = usize;
 
@@ -18,7 +18,6 @@ impl Actor for MessageCounter {
 struct Ping;
 struct Stop;
 
-#[async_trait]
 impl Handler<Ping> for MessageCounter {
     type Return = ();
 
@@ -27,7 +26,6 @@ impl Handler<Ping> for MessageCounter {
     }
 }
 
-#[async_trait]
 impl Handler<Stop> for MessageCounter {
     type Return = ();
 

diff --git a/xtra/examples/message_stealing_multiple_actors.rs b/xtra/examples/message_stealing_multiple_actors.rs
@@ -23,7 +23,6 @@ impl Printer {
 
 struct Print(String);
 
-#[async_trait]
 impl Handler<Print> for Printer {
     type Return = ();
 

diff --git a/xtra/examples/scoped_actor_task.rs b/xtra/examples/scoped_actor_task.rs
@@ -6,7 +6,6 @@ struct MyActor;
 
 struct Print(String);
 
-#[async_trait]
 impl Handler<Print> for MyActor {
     type Return = ();
 

diff --git a/xtra/examples/send_interval.rs b/xtra/examples/send_interval.rs
@@ -11,7 +11,6 @@ struct Greeter;
 
 struct Greet;
 
-#[async_trait]
 impl Handler<Greet> for Greeter {
     type Return = ();
 

diff --git a/xtra/src/address.rs b/xtra/src/address.rs
@@ -130,10 +130,10 @@ impl<A, Rc: RefCounter> Address<A, Rc> {
     /// # use xtra::prelude::*;
     /// # use std::time::Duration;
     /// # struct MyActor;
-    /// # #[async_trait] impl Actor for MyActor {type Stop = (); async fn stopped(self) -> Self::Stop {} }
+    /// #  impl Actor for MyActor {type Stop = (); async fn stopped(self) -> Self::Stop {} }
     /// struct Shutdown;
     ///
-    /// #[async_trait]
+    ///
     /// impl Handler<Shutdown> for MyActor {
     ///     type Return = ();
     ///

diff --git a/xtra/src/chan/ptr.rs b/xtra/src/chan/ptr.rs
@@ -380,7 +380,6 @@ mod tests {
 
     struct Foo;
 
-    #[async_trait::async_trait]
     impl crate::Actor for Foo {
         type Stop = ();
 

diff --git a/xtra/src/dispatch_future.rs b/xtra/src/dispatch_future.rs
@@ -43,13 +43,14 @@ impl<'a, A> DispatchFuture<'a, A> {
     /// In case this future has not yet been polled, a new span will be created which is why this function takes `&mut self`.
     ///
     /// ```rust
+
     /// # use std::ops::ControlFlow;
     /// # use std::time::Duration;
     /// # use tokio::time::timeout;
     /// # use xtra::prelude::*;
     /// #
     /// # struct MyActor;
-    /// # #[async_trait::async_trait] impl Actor for MyActor { type Stop = (); async fn stopped(self) {} }
+    /// # impl Actor for MyActor { type Stop = (); async fn stopped(self) {} }
     /// #
     /// # let mut actor = MyActor;
     /// # let (addr, mut mailbox) = Mailbox::unbounded();