Skip to content

Refactor join type #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3 commits merged into from
Nov 27, 2019
Merged

Refactor join type #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3a785e
refactor: update future join type
k-nasa Nov 23, 2019
ac0dabc
test: update future join test
k-nasa Nov 23, 2019
d28a8be
update future::try_join
k-nasa Nov 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/future/future/join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pin_project! {
pub struct Join<L, R>
where
L: Future,
R: Future<Output = L::Output>
R: Future,
{
#[pin] left: MaybeDone<L>,
#[pin] right: MaybeDone<R>,
Expand All @@ -22,7 +22,7 @@ pin_project! {
impl<L, R> Join<L, R>
where
L: Future,
R: Future<Output = L::Output>,
R: Future,
{
pub(crate) fn new(left: L, right: R) -> Self {
Self {
Expand All @@ -35,7 +35,7 @@ where
impl<L, R> Future for Join<L, R>
where
L: Future,
R: Future<Output = L::Output>,
R: Future,
{
type Output = (L::Output, R::Output);

Expand Down
20 changes: 10 additions & 10 deletions src/future/future/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,10 @@ extension_trait! {
use async_std::future;

let a = future::ready(1u8);
let b = future::ready(2u8);
let b = future::ready(2u16);

let f = a.join(b);
assert_eq!(f.await, (1u8, 2u8));
assert_eq!(f.await, (1u8, 2u16));
# });
```
"#]
Expand All @@ -304,7 +304,7 @@ extension_trait! {
) -> impl Future<Output = (<Self as std::future::Future>::Output, <F as std::future::Future>::Output)> [Join<Self, F>]
where
Self: std::future::Future + Sized,
F: std::future::Future<Output = <Self as std::future::Future>::Output>,
F: std::future::Future,
{
Join::new(self, other)
}
Expand All @@ -328,30 +328,30 @@ extension_trait! {
use async_std::prelude::*;
use async_std::future;

let a = future::ready(Err("Error"));
let a = future::ready(Err::<u8, &str>("Error"));
let b = future::ready(Ok(1u8));

let f = a.try_join(b);
assert_eq!(f.await, Err("Error"));

let a = future::ready(Ok::<u8, String>(1u8));
let b = future::ready(Ok::<u8, String>(2u8));
let b = future::ready(Ok::<u16, String>(2u16));

let f = a.try_join(b);
assert_eq!(f.await, Ok((1u8, 2u8)));
assert_eq!(f.await, Ok((1u8, 2u16)));
#
# Ok(()) }) }
```
"#]
#[cfg(any(feature = "unstable", feature = "docs"))]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
fn try_join<F, T, E>(
fn try_join<F, A, B, E>(
self,
other: F
) -> impl Future<Output = Result<(T, T), E>> [TryJoin<Self, F>]
) -> impl Future<Output = Result<(A, B), E>> [TryJoin<Self, F>]
where
Self: std::future::Future<Output = Result<T, E>> + Sized,
F: std::future::Future<Output = <Self as std::future::Future>::Output>,
Self: std::future::Future<Output = Result<A, E>> + Sized,
F: std::future::Future<Output = Result<B, E>>,
{
TryJoin::new(self, other)
}
Expand Down
12 changes: 6 additions & 6 deletions src/future/future/try_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pin_project! {
pub struct TryJoin<L, R>
where
L: Future,
R: Future<Output = L::Output>
R: Future,
{
#[pin] left: MaybeDone<L>,
#[pin] right: MaybeDone<R>,
Expand All @@ -22,7 +22,7 @@ pin_project! {
impl<L, R> TryJoin<L, R>
where
L: Future,
R: Future<Output = L::Output>,
R: Future,
{
pub(crate) fn new(left: L, right: R) -> Self {
Self {
Expand All @@ -32,12 +32,12 @@ where
}
}

impl<L, R, T, E> Future for TryJoin<L, R>
impl<L, R, A, B, E> Future for TryJoin<L, R>
where
L: Future<Output = Result<T, E>>,
R: Future<Output = L::Output>,
L: Future<Output = Result<A, E>>,
R: Future<Output = Result<B, E>>,
{
type Output = Result<(T, T), E>;
type Output = Result<(A, B), E>;

fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let this = self.project();
Expand Down