Skip to content

Commit 517d462

Browse files
committed
Make std::future a re-export of core::future
1 parent 7d747db commit 517d462

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

library/std/src/future.rs

-17
This file was deleted.

library/std/src/lib.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,8 @@ pub use core::cmp;
407407
pub use core::convert;
408408
#[stable(feature = "rust1", since = "1.0.0")]
409409
pub use core::default;
410+
#[stable(feature = "futures_api", since = "1.36.0")]
411+
pub use core::future;
410412
#[stable(feature = "rust1", since = "1.0.0")]
411413
pub use core::hash;
412414
#[stable(feature = "core_hint", since = "1.27.0")]
@@ -494,9 +496,6 @@ pub mod task {
494496
pub use alloc::task::*;
495497
}
496498

497-
#[stable(feature = "futures_api", since = "1.36.0")]
498-
pub mod future;
499-
500499
// Platform-abstraction modules
501500
#[macro_use]
502501
mod sys_common;

0 commit comments

Comments
 (0)