Skip to content

Commit f02c36b

Browse files
committed
Remove top-level re-export of Poll
1 parent 90c83b8 commit f02c36b

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

futures-core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ pub mod stream;
2727

2828
#[macro_use]
2929
pub mod task;
30-
#[doc(hidden)] pub use self::task::Poll;
3130

3231
#[doc(hidden)]
3332
pub mod core_reexport {

futures-util/src/stream/select_all.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use core::fmt::{self, Debug};
44
use core::iter::FromIterator;
55
use core::pin::Pin;
66

7-
use futures_core::{Poll, Stream, FusedStream};
8-
use futures_core::task::Context;
7+
use futures_core::stream::{Stream, FusedStream};
8+
use futures_core::task::{Context, Poll};
99

1010
use crate::stream::{StreamExt, StreamFuture, FuturesUnordered};
1111

futures/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ compile_error!("The `bilock` feature requires the `unstable` feature as an expli
6060
#[cfg(feature = "std")]
6161
#[doc(hidden)] pub use futures_util::{AsyncReadExt, AsyncWriteExt, AsyncSeekExt, AsyncBufReadExt};
6262

63-
#[doc(hidden)] pub use futures_core::task::Poll;
64-
6563
#[doc(hidden)] pub use futures_util::never::Never;
6664

6765
// Macro reexports

futures/tests/async_await_macros.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#![recursion_limit="128"]
22

3-
use futures::{Poll, pending, pin_mut, poll, join, try_join, select};
3+
use futures::{pending, pin_mut, poll, join, try_join, select};
44
use futures::channel::{mpsc, oneshot};
55
use futures::executor::block_on;
66
use futures::future::{self, FutureExt};
7-
use futures::stream::StreamExt;
87
use futures::sink::SinkExt;
8+
use futures::stream::StreamExt;
9+
use futures::task::Poll;
910

1011
#[test]
1112
fn poll_and_pending() {

futures/tests/atomic_waker.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ use std::sync::atomic::Ordering;
33
use std::sync::Arc;
44
use std::thread;
55

6-
use futures_core::Poll;
7-
use futures_executor::block_on;
8-
use futures_util::future::poll_fn;
9-
use futures_util::task::AtomicWaker;
6+
use futures::executor::block_on;
7+
use futures::future::poll_fn;
8+
use futures::task::{AtomicWaker, Poll};
109

1110
#[test]
1211
fn basic() {

futures/tests/io_cursor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use assert_matches::assert_matches;
2-
use futures::Poll;
32
use futures::future::lazy;
43
use futures::io::AsyncWrite;
4+
use futures::task::Poll;
55
use std::io::Cursor;
66
use std::pin::Pin;
77

0 commit comments

Comments
 (0)