Skip to content

Commit 13b88c2

Browse files
Rollup merge of #79174 - taiki-e:std-future, r=Mark-Simulacrum
Make std::future a re-export of core::future After 1a764a7, there are no `std::future`-specific items (except for `cfg(bootstrap)` items removed in 93eed40). So, instead of defining `std` own module, we can re-export the `core::future` directly.
2 parents d9c177f + 517d462 commit 13b88c2

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
@@ -406,6 +406,8 @@ pub use core::cmp;
406406
pub use core::convert;
407407
#[stable(feature = "rust1", since = "1.0.0")]
408408
pub use core::default;
409+
#[stable(feature = "futures_api", since = "1.36.0")]
410+
pub use core::future;
409411
#[stable(feature = "rust1", since = "1.0.0")]
410412
pub use core::hash;
411413
#[stable(feature = "core_hint", since = "1.27.0")]
@@ -505,9 +507,6 @@ pub mod task {
505507
pub use alloc::task::*;
506508
}
507509

508-
#[stable(feature = "futures_api", since = "1.36.0")]
509-
pub mod future;
510-
511510
// Platform-abstraction modules
512511
#[macro_use]
513512
mod sys_common;

0 commit comments

Comments
 (0)