diff options
| author | Matthew Jasper <mjjasper1@gmail.com> | 2020-02-14 22:39:55 +0000 |
|---|---|---|
| committer | Matthew Jasper <mjjasper1@gmail.com> | 2020-02-14 22:40:03 +0000 |
| commit | d863978f89c74bd5cb90baa47331d421bbfd3936 (patch) | |
| tree | eb7b739bd0e73fd7f4b1eda8ae71d1c970c257ea /src/libstd/future.rs | |
| parent | edddb62099056abae853aa1157919d3ec112eeb4 (diff) | |
| download | rust-d863978f89c74bd5cb90baa47331d421bbfd3936.tar.gz rust-d863978f89c74bd5cb90baa47331d421bbfd3936.zip | |
Fix tests after rebase
Diffstat (limited to 'src/libstd/future.rs')
| -rw-r--r-- | src/libstd/future.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index f74c84e6dfd..7b1beb1ecda 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -16,9 +16,10 @@ pub use core::future::*; /// /// This function returns a `GenFuture` underneath, but hides it in `impl Trait` to give /// better error messages (`impl Future` rather than `GenFuture<[closure.....]>`). +// This is `const` to avoid extra errors after we recover from `const async fn` #[doc(hidden)] #[unstable(feature = "gen_future", issue = "50547")] -pub fn from_generator<T: Generator<Yield = ()>>(x: T) -> impl Future<Output = T::Return> { +pub const fn from_generator<T: Generator<Yield = ()>>(x: T) -> impl Future<Output = T::Return> { GenFuture(x) } |