about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/future.rs6
-rw-r--r--src/libstd/lib.rs1
2 files changed, 1 insertions, 6 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index 908736c6393..9c7422c2b20 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -10,11 +10,7 @@ use core::task::{Context, Poll};
 
 #[doc(inline)]
 #[stable(feature = "futures_api", since = "1.36.0")]
-pub use core::future::Future;
-
-#[doc(inline)]
-#[unstable(feature = "into_future", issue = "67644")]
-pub use core::future::IntoFuture;
+pub use core::future::*;
 
 /// Wrap a generator in a future.
 ///
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 930bf397bc4..4b15c9ba4f3 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -269,7 +269,6 @@
 #![feature(hashmap_internals)]
 #![feature(int_error_internals)]
 #![feature(int_error_matching)]
-#![feature(into_future)]
 #![feature(integer_atomics)]
 #![feature(lang_items)]
 #![feature(libc)]