Skip to content

Commit 48cb6be

Browse files
authoredApr 24, 2019
Rollup merge of #59739 - cramertj:stabilize, r=withoutboats
Stabilize futures_api cc #59725. Based on #59733 and #59119 -- only the last two commits here are relevant. r? @withoutboats , @oli-obk for the introduction of `rustc_allow_const_fn_ptr`.
2 parents 5f82b5b + 3f966dc commit 48cb6be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+178
-71
lines changed
 

‎src/liballoc/boxed.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ impl<G: ?Sized + Generator> Generator for Pin<Box<G>> {
911911
}
912912
}
913913

914-
#[unstable(feature = "futures_api", issue = "50547")]
914+
#[stable(feature = "futures_api", since = "1.36.0")]
915915
impl<F: ?Sized + Future + Unpin> Future for Box<F> {
916916
type Output = F::Output;
917917

‎src/liballoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
#![feature(fmt_internals)]
8686
#![feature(fn_traits)]
8787
#![feature(fundamental)]
88-
#![feature(futures_api)]
8988
#![feature(lang_items)]
9089
#![feature(libc)]
9190
#![feature(needs_allocator)]

0 commit comments

Comments
 (0)
Please sign in to comment.