Move Maybe* traits back to iced_futures

core/src/lib.rs

@@ -35,7 +35,6 @@ mod color;
 mod content_fit;
 mod element;
 mod length;
-mod maybe;
 mod padding;
 mod pixels;
 mod point;
@@ -60,7 +59,6 @@ pub use font::Font;
 pub use gradient::Gradient;
 pub use layout::Layout;
 pub use length::Length;
-pub use maybe::{MaybeSend, MaybeSync};
 pub use overlay::Overlay;
 pub use padding::Padding;
 pub use pixels::Pixels;

futures/src/event.rs

@@ -1,8 +1,8 @@
 //! Listen to runtime events.
 use crate::core::event::{self, Event};
 use crate::core::window;
-use crate::core::MaybeSend;
 use crate::subscription::{self, Subscription};
+use crate::MaybeSend;
 
 /// Returns a [`Subscription`] to all the ignored runtime events.
 ///

futures/src/executor.rs

@@ -1,5 +1,6 @@
 //! Choose your preferred executor to power a runtime.
-use crate::core::MaybeSend;
+use crate::MaybeSend;
+
 use futures::Future;
 
 /// A type that can run futures.

futures/src/keyboard.rs

@@ -2,8 +2,8 @@
 use crate::core;
 use crate::core::event;
 use crate::core::keyboard::{Event, Key, Modifiers};
-use crate::core::MaybeSend;
 use crate::subscription::{self, Subscription};
+use crate::MaybeSend;
 
 /// Listens to keyboard key presses and calls the given function
 /// map them into actual messages.

futures/src/lib.rs

@@ -8,6 +8,7 @@
 pub use futures;
 pub use iced_core as core;
 
+mod maybe;
 mod runtime;
 
 pub mod backend;
@@ -17,6 +18,7 @@ pub mod keyboard;
 pub mod subscription;
 
 pub use executor::Executor;
+pub use maybe::{MaybeSend, MaybeSync};
 pub use platform::*;
 pub use runtime::Runtime;
 pub use subscription::Subscription;

futures/src/runtime.rs

@@ -1,7 +1,6 @@
 //! Run commands and keep track of subscriptions.
-use crate::core::MaybeSend;
 use crate::subscription;
-use crate::{BoxFuture, BoxStream, Executor};
+use crate::{BoxFuture, BoxStream, Executor, MaybeSend};
 
 use futures::{channel::mpsc, Sink};
 use std::marker::PhantomData;

futures/src/subscription.rs

@@ -5,9 +5,8 @@ pub use tracker::Tracker;
 
 use crate::core::event;
 use crate::core::window;
-use crate::core::MaybeSend;
 use crate::futures::{Future, Stream};
-use crate::BoxStream;
+use crate::{BoxStream, MaybeSend};
 
 use futures::channel::mpsc;
 use futures::never::Never;

futures/src/subscription/tracker.rs

@@ -1,6 +1,5 @@
-use crate::core::MaybeSend;
 use crate::subscription::{Event, Hasher, Recipe};
-use crate::BoxFuture;
+use crate::{BoxFuture, MaybeSend};
 
 use futures::channel::mpsc;
 use futures::sink::{Sink, SinkExt};

graphics/src/compositor.rs

@@ -1,6 +1,7 @@
 //! A compositor is responsible for initializing a renderer and managing window
 //! surfaces.
-use crate::core::{Color, MaybeSend, MaybeSync};
+use crate::core::Color;
+use crate::futures::{MaybeSend, MaybeSync};
 use crate::{Error, Settings, Viewport};
 
 use raw_window_handle::{HasDisplayHandle, HasWindowHandle};

runtime/src/task.rs

@@ -1,11 +1,10 @@
 use crate::core::widget;
-use crate::core::MaybeSend;
 use crate::futures::futures::channel::mpsc;
 use crate::futures::futures::channel::oneshot;
 use crate::futures::futures::future::{self, FutureExt};
 use crate::futures::futures::never::Never;
 use crate::futures::futures::stream::{self, Stream, StreamExt};
-use crate::futures::{boxed_stream, BoxStream};
+use crate::futures::{boxed_stream, BoxStream, MaybeSend};
 use crate::Action;
 
 use std::future::Future;
@@ -75,7 +74,7 @@
         let action = f(sender);
 
         Self(Some(boxed_stream(
             stream::once(async move { action }).chain(
                 receiver.into_stream().filter_map(|result| async move {
                     Some(Action::Output(result.ok()?))
                 }),
@@ -94,7 +93,7 @@
         let action = f(sender);
 
         Self(Some(boxed_stream(
             stream::once(async move { action })
                 .chain(receiver.map(|result| Action::Output(result))),
         )))
     }
@@ -103,7 +102,7 @@
     pub fn effect(action: impl Into<Action<Never>>) -> Self {
         let action = action.into();
 
         Self(Some(boxed_stream(stream::once(async move {
             action.output().expect_err("no output")
         }))))
     }
@@ -140,7 +139,7 @@
                     match action.output() {
                         Ok(output) => f(output)
                             .0
                             .unwrap_or_else(|| boxed_stream(stream::empty())),
                         Err(action) => {
                             boxed_stream(stream::once(async move { action }))
                         }