Skip to content

Commit

Permalink
Split iced_futures into different backend implementations
Browse files Browse the repository at this point in the history
  • Loading branch information
hecrj committed Jan 28, 2022
1 parent 5dab5a3 commit 167be45
Show file tree
Hide file tree
Showing 19 changed files with 280 additions and 318 deletions.
10 changes: 10 additions & 0 deletions futures/src/backend.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//! The underlying implementations of the `iced_futures` contract!
pub mod null;

#[cfg(not(target_arch = "wasm32"))]
pub mod native;

#[cfg(target_arch = "wasm32")]
pub mod wasm;

pub mod default;
38 changes: 38 additions & 0 deletions futures/src/backend/default.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
//! A default, cross-platform backend.
//!
//! - On native platforms, it will use:
//! - `backend::native::tokio` when the `tokio` feature is enabled.
//! - `backend::native::async-std` when the `async-std` feature is
//! enabled.
//! - `backend::native::smol` when the `smol` feature is enabled.
//! - `backend::native::thread_pool` otherwise.
//!
//! - On Wasm, it will use `backend::wasm::wasm_bindgen`.
#[cfg(not(target_arch = "wasm32"))]
mod platform {
#[cfg(feature = "tokio")]
pub use crate::backend::native::tokio::*;

#[cfg(all(feature = "async-std", not(feature = "tokio"),))]
pub use crate::backend::native::async_std::*;

#[cfg(all(
feature = "smol",
not(any(feature = "tokio", feature = "async-std")),
))]
pub use crate::backend::native::smol::*;

#[cfg(not(any(
feature = "tokio",
feature = "async-std",
feature = "smol",
)))]
pub use crate::backend::native::thread_pool::*;
}

#[cfg(target_arch = "wasm32")]
mod platform {
pub use crate::backend::wasm::wasm_bindgen::*;
}

pub use platform::*;
16 changes: 16 additions & 0 deletions futures/src/backend/native.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//! Backends that are only available in native platforms: Windows, macOS, or Linux.
#[cfg_attr(docsrs, doc(cfg(feature = "tokio",)))]
#[cfg(feature = "tokio")]
pub mod tokio;

#[cfg_attr(docsrs, doc(cfg(feature = "async-std",)))]
#[cfg(feature = "async-std")]
pub mod async_std;

#[cfg_attr(docsrs, doc(cfg(feature = "smol",)))]
#[cfg(feature = "smol")]
pub mod smol;

#[cfg_attr(docsrs, doc(cfg(feature = "thread-pool",)))]
#[cfg(feature = "thread-pool")]
pub mod thread_pool;
59 changes: 59 additions & 0 deletions futures/src/backend/native/async_std.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
//! An `async-std` backend.
use futures::Future;

/// An `async-std` executor.
#[derive(Debug)]
pub struct Executor;

impl crate::Executor for Executor {
fn new() -> Result<Self, futures::io::Error> {
Ok(Self)
}

fn spawn(&self, future: impl Future<Output = ()> + Send + 'static) {
let _ = async_std::task::spawn(future);
}
}

pub mod time {
//! Listen and react to time.
use crate::subscription::{self, Subscription};

/// Returns a [`Subscription`] that produces messages at a set interval.
///
/// The first message is produced after a `duration`, and then continues to
/// produce more messages every `duration` after that.
pub fn every<H: std::hash::Hasher, E>(
duration: std::time::Duration,
) -> Subscription<H, E, std::time::Instant> {
Subscription::from_recipe(Every(duration))
}

#[derive(Debug)]
struct Every(std::time::Duration);

impl<H, E> subscription::Recipe<H, E> for Every
where
H: std::hash::Hasher,
{
type Output = std::time::Instant;

fn hash(&self, state: &mut H) {
use std::hash::Hash;

std::any::TypeId::of::<Self>().hash(state);
self.0.hash(state);
}

fn stream(
self: Box<Self>,
_input: futures::stream::BoxStream<'static, E>,
) -> futures::stream::BoxStream<'static, Self::Output> {
use futures::stream::StreamExt;

async_std::stream::interval(self.0)
.map(|_| std::time::Instant::now())
.boxed()
}
}
}
59 changes: 59 additions & 0 deletions futures/src/backend/native/smol.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
//! A `smol` backend.
use futures::Future;

/// A `smol` executor.
#[cfg_attr(docsrs, doc(cfg(feature = "smol")))]
#[derive(Debug)]
pub struct Executor;

impl crate::Executor for Executor {
fn new() -> Result<Self, futures::io::Error> {
Ok(Self)
}

fn spawn(&self, future: impl Future<Output = ()> + Send + 'static) {
smol::spawn(future).detach();
}
}

pub mod time {
//! Listen and react to time.
use crate::subscription::{self, Subscription};

/// Returns a [`Subscription`] that produces messages at a set interval.
///
/// The first message is produced after a `duration`, and then continues to
/// produce more messages every `duration` after that.
pub fn every<H: std::hash::Hasher, E>(
duration: std::time::Duration,
) -> Subscription<H, E, std::time::Instant> {
Subscription::from_recipe(Every(duration))
}

#[derive(Debug)]
struct Every(std::time::Duration);

impl<H, E> subscription::Recipe<H, E> for Every
where
H: std::hash::Hasher,
{
type Output = std::time::Instant;

fn hash(&self, state: &mut H) {
use std::hash::Hash;

std::any::TypeId::of::<Self>().hash(state);
self.0.hash(state);
}

fn stream(
self: Box<Self>,
_input: futures::stream::BoxStream<'static, E>,
) -> futures::stream::BoxStream<'static, Self::Output> {
use futures::stream::StreamExt;

smol::Timer::interval(self.0).boxed()
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
use crate::Executor;

//! A `ThreadPool` backend.
use futures::Future;

/// A thread pool runtime for futures.
/// A thread pool executor for futures.
#[cfg_attr(docsrs, doc(cfg(feature = "thread-pool")))]
pub type ThreadPool = futures::executor::ThreadPool;

impl Executor for futures::executor::ThreadPool {
impl crate::Executor for futures::executor::ThreadPool {
fn new() -> Result<Self, futures::io::Error> {
futures::executor::ThreadPool::new()
}
Expand Down
72 changes: 72 additions & 0 deletions futures/src/backend/native/tokio.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
//! A `tokio` backend.
use futures::Future;

/// A `tokio` executor.
pub type Executor = tokio::runtime::Runtime;

impl crate::Executor for Executor {
fn new() -> Result<Self, futures::io::Error> {
tokio::runtime::Runtime::new()
}

fn spawn(&self, future: impl Future<Output = ()> + Send + 'static) {
let _ = tokio::runtime::Runtime::spawn(self, future);
}

fn enter<R>(&self, f: impl FnOnce() -> R) -> R {
let _guard = tokio::runtime::Runtime::enter(self);
f()
}
}

pub mod time {
//! Listen and react to time.
use crate::subscription::{self, Subscription};

/// Returns a [`Subscription`] that produces messages at a set interval.
///
/// The first message is produced after a `duration`, and then continues to
/// produce more messages every `duration` after that.
pub fn every<H: std::hash::Hasher, E>(
duration: std::time::Duration,
) -> Subscription<H, E, std::time::Instant> {
Subscription::from_recipe(Every(duration))
}

#[derive(Debug)]
struct Every(std::time::Duration);

impl<H, E> subscription::Recipe<H, E> for Every
where
H: std::hash::Hasher,
{
type Output = std::time::Instant;

fn hash(&self, state: &mut H) {
use std::hash::Hash;

std::any::TypeId::of::<Self>().hash(state);
self.0.hash(state);
}

fn stream(
self: Box<Self>,
_input: futures::stream::BoxStream<'static, E>,
) -> futures::stream::BoxStream<'static, Self::Output> {
use futures::stream::StreamExt;

let start = tokio::time::Instant::now() + self.0;

let stream = {
futures::stream::unfold(
tokio::time::interval_at(start, self.0),
|mut interval| async move {
Some((interval.tick().await, interval))
},
)
};

stream.map(tokio::time::Instant::into_std).boxed()
}
}
}
7 changes: 3 additions & 4 deletions futures/src/executor/null.rs → futures/src/backend/null.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
use crate::Executor;

//! A backend that does nothing!
use futures::Future;

/// An executor that drops all the futures, instead of spawning them.
#[derive(Debug)]
pub struct Null;
pub struct Executor;

impl Executor for Null {
impl crate::Executor for Executor {
fn new() -> Result<Self, futures::io::Error> {
Ok(Self)
}
Expand Down
2 changes: 2 additions & 0 deletions futures/src/backend/wasm.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
//! Backends that are only available on Wasm targets.
pub mod wasm_bindgen;
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use crate::Executor;
//! A `wasm-bindgein-futures` backend.
/// A `wasm-bindgen-futures` runtime.
/// A `wasm-bindgen-futures` executor.
#[derive(Debug)]
pub struct WasmBindgen;
pub struct Executor;

impl Executor for WasmBindgen {
impl crate::Executor for Executor {
fn new() -> Result<Self, futures::io::Error> {
Ok(Self)
}
Expand Down
34 changes: 0 additions & 34 deletions futures/src/executor.rs
Original file line number Diff line number Diff line change
@@ -1,38 +1,4 @@
//! Choose your preferred executor to power a runtime.
mod null;

#[cfg(all(not(target_arch = "wasm32"), feature = "thread-pool"))]
mod thread_pool;

#[cfg(all(not(target_arch = "wasm32"), feature = "tokio"))]
mod tokio;

#[cfg(all(not(target_arch = "wasm32"), feature = "async-std"))]
mod async_std;

#[cfg(all(not(target_arch = "wasm32"), feature = "smol"))]
mod smol;

#[cfg(target_arch = "wasm32")]
mod wasm_bindgen;

pub use null::Null;

#[cfg(all(not(target_arch = "wasm32"), feature = "thread-pool"))]
pub use thread_pool::ThreadPool;

#[cfg(all(not(target_arch = "wasm32"), feature = "tokio"))]
pub use self::tokio::Tokio;

#[cfg(all(not(target_arch = "wasm32"), feature = "async-std"))]
pub use self::async_std::AsyncStd;

#[cfg(all(not(target_arch = "wasm32"), feature = "smol"))]
pub use self::smol::Smol;

#[cfg(target_arch = "wasm32")]
pub use wasm_bindgen::WasmBindgen;

use crate::MaybeSend;
use futures::Future;

Expand Down
18 changes: 0 additions & 18 deletions futures/src/executor/async_std.rs

This file was deleted.

18 changes: 0 additions & 18 deletions futures/src/executor/smol.rs

This file was deleted.

Loading

0 comments on commit 167be45

Please sign in to comment.