From 517d462e40a308976b84797c318e912642cf521a Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Thu, 19 Nov 2020 03:39:16 +0900
Subject: [PATCH] Make std::future a re-export of core::future

---
 library/std/src/future.rs | 17 -----------------
 library/std/src/lib.rs    |  5 ++---
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 library/std/src/future.rs

diff --git a/library/std/src/future.rs b/library/std/src/future.rs
deleted file mode 100644
index 9d9c36e9afb0f..0000000000000
--- a/library/std/src/future.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//! Asynchronous values.
-
-#[doc(inline)]
-#[stable(feature = "futures_api", since = "1.36.0")]
-pub use core::future::Future;
-
-#[doc(inline)]
-#[unstable(feature = "gen_future", issue = "50547")]
-pub use core::future::{from_generator, get_context, ResumeTy};
-
-#[doc(inline)]
-#[stable(feature = "future_readiness_fns", since = "1.48.0")]
-pub use core::future::{pending, ready, Pending, Ready};
-
-#[doc(inline)]
-#[unstable(feature = "into_future", issue = "67644")]
-pub use core::future::IntoFuture;
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index db523f05e01a5..6e9b7ef751c4b 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -407,6 +407,8 @@ pub use core::cmp;
 pub use core::convert;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core::default;
+#[stable(feature = "futures_api", since = "1.36.0")]
+pub use core::future;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core::hash;
 #[stable(feature = "core_hint", since = "1.27.0")]
@@ -494,9 +496,6 @@ pub mod task {
     pub use alloc::task::*;
 }
 
-#[stable(feature = "futures_api", since = "1.36.0")]
-pub mod future;
-
 // Platform-abstraction modules
 #[macro_use]
 mod sys_common;