6 files changed, 18 insertions(+), 7 deletions(-)

M Cargo.toml
M src/executor.rs
M src/testing_util.rs
M src/util/async_actor.rs
M src/util/sync_actor.rs
M src/util/wrapped_channels.rs

@@ 10,9 10,14 @@ repository = "https://git.sr.ht/~thatonelutenist/peerdex"
 license = "0BSD"
 publish = false
 
+[features]
+# Support for the async-std executor
+async-std = ["dep:async-std"]
+default = ["async-std"]
+
 [dependencies]
 async-mutex = "1.4.0"
-async-std = "1.12.0"
+async-std = { version = "1.12.0", optional = true }
 async-trait = "0.1.58"
 enum_dispatch = "0.3.8"
 flume = "0.10.14"

@@ 4,9 4,11 @@ use std::{convert::Infallible, future::Future};
 use async_trait::async_trait;
 use futures::future::BoxFuture;
 
+#[cfg(feature = "async-std")]
 pub mod asyncstd;
 pub mod threads;
 
+#[cfg(feature = "async-std")]
 pub use asyncstd::AsyncStd;
 pub use threads::Threads;
 

@@ 135,6 135,7 @@ mod tests {
     use super::*;
     use crate::traits::ActorExt;
 
+    #[cfg(feature = "async-std")]
     mod async_math_actor {
 
         use futures::StreamExt;

@@ 402,7 402,7 @@ impl<X: Executor, I: Event, O: Event> Actor<I, O, X> for AsyncActor<I, O, X> {
 mod tests {
     use super::*;
     use crate::{
-        executor::{AsyncStd, Threads},
+        executor::Threads,
         testing_util::{Add, Math, MathEvent, MathEventType, Output, OutputEvent},
         util::Collector,
     };


@@ 509,9 509,10 @@ mod tests {
         assert_eq!(collector_out, expected);
     }
 
+    #[cfg(feature = "async-std")]
     #[async_std::test]
     async fn smoke_async_std() {
-        smoke::<AsyncStd>().await;
+        smoke::<crate::executor::AsyncStd>().await;
     }
 
     #[async_std::test]

@@ 375,7 375,7 @@ impl<X: Executor, I: Event, O: Event> Actor<I, O, X> for SyncActor<I, O, X> {
 mod tests {
     use super::*;
     use crate::{
-        executor::{AsyncStd, Threads},
+        executor::Threads,
         testing_util::{Add, Math, MathEvent, MathEventType, Output, OutputEvent},
         util::Collector,
     };


@@ 471,9 471,10 @@ mod tests {
         assert_eq!(collector_out, expected);
     }
 
+    #[cfg(feature = "async-std")]
     #[test]
     fn smoke_async_std() {
-        smoke::<AsyncStd>();
+        smoke::<crate::executor::AsyncStd>();
     }
 
     #[test]

@@ 137,7 137,7 @@ mod tests {
 
     use super::*;
     use crate::{
-        executor::{AsyncStd, Executor, Threads},
+        executor::{Executor, Threads},
         traits::Actor,
         util::{AsyncActor, WrappedEvent},
     };


@@ 203,9 203,10 @@ mod tests {
         assert!(res.val == 99 || res.val == 100);
     }
 
+    #[cfg(feature = "async-std")]
     #[async_std::test]
     async fn smoke_async_std() {
-        smoke::<AsyncStd>().await;
+        smoke::<crate::executor::AsyncStd>().await;
     }
 
     #[async_std::test]