-
Notifications
You must be signed in to change notification settings - Fork 632
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.
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
Add future::pinned combinator #1023
Open
cramertj
wants to merge
2
commits into
rust-lang:master
Choose a base branch
from
cramertj:future-borrowed
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,116 @@ | ||
//! Definition of the `PinnedFut` adapter combinator | ||
|
||
// TODO: import `Pinned` and use it to make `Borrowed` immovable. | ||
use core::mem::PinMut; | ||
|
||
use futures_core::{Future, Poll}; | ||
use futures_core::task; | ||
|
||
pub trait PinnedFnLt<'a, Data: 'a, Output> { | ||
type Future: Future<Output = Output> + 'a; | ||
fn apply(self, data: PinMut<'a, Data>) -> Self::Future; | ||
} | ||
|
||
pub trait PinnedFn<Data, Output>: for<'a> PinnedFnLt<'a, Data, Output> + 'static {} | ||
impl<Data, Output, T> PinnedFn<Data, Output> for T | ||
where T: for<'a> PinnedFnLt<'a, Data, Output> + 'static {} | ||
|
||
impl<'a, Data, Output, Fut, T> PinnedFnLt<'a, Data, Output> for T | ||
where | ||
Data: 'a, | ||
T: FnOnce(PinMut<'a, Data>) -> Fut, | ||
Fut: Future<Output = Output> + 'a, | ||
{ | ||
type Future = Fut; | ||
fn apply(self, data: PinMut<'a, Data>) -> Self::Future { | ||
(self)(data) | ||
} | ||
} | ||
|
||
/// A future which borrows a value for an asynchronous lifetime. | ||
/// | ||
/// Created by the `borrowed` function. | ||
#[must_use = "futures do nothing unless polled"] | ||
#[allow(missing_debug_implementations)] | ||
pub struct PinnedFut<Data: 'static, Output, F: PinnedFn<Data, Output>> { | ||
fn_or_fut: FnOrFut<Data, Output, F>, | ||
// TODO: | ||
// marker: Pinned, | ||
// Data, which may be borrowed by `fn_or_fut`, must be dropped last | ||
data: Data, | ||
} | ||
|
||
enum FnOrFut<Data: 'static, Output, F: PinnedFn<Data, Output>> { | ||
F(F), | ||
Fut(<F as PinnedFnLt<'static, Data, Output>>::Future), | ||
None, | ||
} | ||
|
||
impl<Data: 'static, Output, F: PinnedFn<Data, Output>> FnOrFut<Data, Output, F> { | ||
fn is_fn(&self) -> bool { | ||
if let FnOrFut::F(_) = self { | ||
true | ||
} else { | ||
false | ||
} | ||
} | ||
} | ||
|
||
/// Creates a new future which pins some data and borrows it for an | ||
/// asynchronous lifetime. | ||
pub fn pinned<Data, Output, F>(data: Data, f: F) -> PinnedFut<Data, Output, F> | ||
where F: PinnedFn<Data, Output>, | ||
Data: 'static, | ||
{ | ||
PinnedFut { | ||
fn_or_fut: FnOrFut::F(f), | ||
data, | ||
} | ||
} | ||
|
||
unsafe fn transmute_lt<'input, 'output, T>(x: &'input mut T) -> &'output mut T { | ||
::std::mem::transmute(x) | ||
} | ||
|
||
impl<Data, Output, F> Future for PinnedFut<Data, Output, F> | ||
where F: PinnedFn<Data, Output>, | ||
Data: 'static, | ||
{ | ||
type Output = <<F as PinnedFnLt<'static, Data, Output>>::Future as Future>::Output; | ||
|
||
fn poll(self: PinMut<Self>, cx: &mut task::Context) -> Poll<Self::Output> { | ||
unsafe { | ||
let this = PinMut::get_mut(self); | ||
if this.fn_or_fut.is_fn() { | ||
if let FnOrFut::F(f) = ::std::mem::replace(&mut this.fn_or_fut, FnOrFut::None) { | ||
let fut = f.apply(PinMut::new_unchecked(transmute_lt(&mut this.data))); | ||
this.fn_or_fut = FnOrFut::Fut(fut); | ||
} else { | ||
unreachable!() | ||
} | ||
} | ||
|
||
let res = if let FnOrFut::Fut(fut) = &mut this.fn_or_fut { | ||
PinMut::new_unchecked(fut).poll(cx) | ||
} else { | ||
panic!("polled PinnedFut after completion") | ||
}; | ||
|
||
if let Poll::Ready(_) = &res { | ||
this.fn_or_fut = FnOrFut::None; | ||
} | ||
|
||
res | ||
} | ||
} | ||
} | ||
|
||
#[allow(unused)] | ||
fn does_compile() -> impl Future<Output = u8> { | ||
pinned(5, |x: PinMut<_>| { // This type annotation is *required* to compile | ||
::future::lazy(move |_cx| { | ||
// we can use (copy from) the asynchronously borrowed data here | ||
*x | ||
}) | ||
}) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe this should use
ManuallyDrop
so as to not rely on drop order?(AFAIK drop order is actually "first field is dropped last", so this may even be wrong right now.)