From a42a0844c2ffc51e117304a5d08e4a0fb52adac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 15 Jan 2021 18:31:30 +0100 Subject: [PATCH] Keep old behavior for `Executor` feature flags --- src/executor.rs | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/executor.rs b/src/executor.rs index 2c6d9ec0..9f3656b1 100644 --- a/src/executor.rs +++ b/src/executor.rs @@ -7,32 +7,25 @@ pub use platform::Default; mod platform { use iced_futures::{executor, futures}; - #[cfg(all( - not(any(feature = "tokio", feature = "smol", feature = "async-std")), - feature = "tokio_old" - ))] + #[cfg(feature = "tokio_old")] type Executor = executor::TokioOld; - #[cfg(all( - not(any( - feature = "tokio_old", - feature = "smol", - feature = "async-std" - )), - feature = "tokio" - ))] + #[cfg(all(feature = "tokio", not(feature = "tokio_old")))] type Executor = executor::Tokio; - #[cfg(feature = "async-std")] + #[cfg(all( + feature = "async-std", + not(any(feature = "tokio_old", feature = "tokio")), + ))] type Executor = executor::AsyncStd; #[cfg(all( + feature = "smol", not(any( feature = "tokio_old", feature = "tokio", feature = "async-std" )), - feature = "smol" ))] type Executor = executor::Smol;