user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tests after rebase

Browse source
This commit is contained in:
Matthew Jasper 2020-02-14 22:39:55 +00:00
parent edddb62099
commit d863978f89
7 changed files with 82 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstd/future.rs
View file

@ -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)
}