diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-24 05:16:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-24 05:16:18 +0200 |
| commit | 48cb6bead104df5158e1e571d0de04b59610e7e6 (patch) | |
| tree | 07b71ec48f84c17e385af632f57174ab0dee5117 /src/liballoc | |
| parent | 5f82b5b8828202d53be0d0e11504094bbcf28806 (diff) | |
| parent | 3f966dcd53faabd8313d29a4e1ba2464995e624a (diff) | |
| download | rust-48cb6bead104df5158e1e571d0de04b59610e7e6.tar.gz rust-48cb6bead104df5158e1e571d0de04b59610e7e6.zip | |
Rollup merge of #59739 - cramertj:stabilize, r=withoutboats
Stabilize futures_api cc https://github.com/rust-lang/rust/issues/59725. Based on https://github.com/rust-lang/rust/pull/59733 and https://github.com/rust-lang/rust/pull/59119 -- only the last two commits here are relevant. r? @withoutboats , @oli-obk for the introduction of `rustc_allow_const_fn_ptr`.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 8a3950718d7..207359ed696 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -911,7 +911,7 @@ impl<G: ?Sized + Generator> Generator for Pin<Box<G>> { } } -#[unstable(feature = "futures_api", issue = "50547")] +#[stable(feature = "futures_api", since = "1.36.0")] impl<F: ?Sized + Future + Unpin> Future for Box<F> { type Output = F::Output; diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 63b3fbbdaef..eb673488170 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -85,7 +85,6 @@ #![feature(fmt_internals)] #![feature(fn_traits)] #![feature(fundamental)] -#![feature(futures_api)] #![feature(lang_items)] #![feature(libc)] #![feature(needs_allocator)] |