From 4cbc31938d1313397d03e6748291aa91364cf18b Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Thu, 12 Sep 2019 17:57:52 +0200 Subject: [PATCH 1/3] add future::{join,try_join} macros Signed-off-by: Yoshua Wuyts --- Cargo.toml | 1 + src/future/mod.rs | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 907c1eb61..fe3981fc6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,7 @@ docs = [] unstable = [] [dependencies] +async-macros = { path = "../async-macros" } async-task = "1.0.0" cfg-if = "0.1.9" crossbeam-channel = "0.3.9" diff --git a/src/future/mod.rs b/src/future/mod.rs index 7d88b9031..d09d60324 100644 --- a/src/future/mod.rs +++ b/src/future/mod.rs @@ -3,6 +3,10 @@ #[doc(inline)] pub use std::future::Future; +#[doc(inline)] +#[cfg_attr(feature = "docs", doc(cfg(unstable)))] +pub use async_macros::{join, try_join}; + use cfg_if::cfg_if; pub use pending::pending; From fb2d2e28c1e62423dbf38d25da00a0b28ee9d56f Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Mon, 16 Sep 2019 13:58:15 +0200 Subject: [PATCH 2/3] try_select, select Signed-off-by: Yoshua Wuyts --- src/future/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/future/mod.rs b/src/future/mod.rs index d09d60324..4c1d460fc 100644 --- a/src/future/mod.rs +++ b/src/future/mod.rs @@ -5,7 +5,7 @@ pub use std::future::Future; #[doc(inline)] #[cfg_attr(feature = "docs", doc(cfg(unstable)))] -pub use async_macros::{join, try_join}; +pub use async_macros::{join, select, try_join, try_select}; use cfg_if::cfg_if; From b951cf2d3b1a7848a33066c088b33019c551228b Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Tue, 17 Sep 2019 23:07:25 +0200 Subject: [PATCH 3/3] use async-macros 1.0.0 Signed-off-by: Yoshua Wuyts --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index fe3981fc6..133eadcd4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ docs = [] unstable = [] [dependencies] -async-macros = { path = "../async-macros" } +async-macros = "1.0.0" async-task = "1.0.0" cfg-if = "0.1.9" crossbeam-channel = "0.3.9"