Skip to content

Commit 62894c6

Browse files
taiki-ecramertj
authored andcommitted
Move Never type from futures-core to futures-util
1 parent 4c96148 commit 62894c6

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

futures-core/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ pub mod stream;
2929
pub mod task;
3030
#[doc(hidden)] pub use self::task::Poll;
3131

32-
pub mod never;
33-
#[doc(hidden)] pub use self::never::Never;
34-
3532
#[doc(hidden)]
3633
pub mod core_reexport {
3734
#[doc(hidden)]

futures-util/src/future/never_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use crate::never::Never;
12
use core::pin::Pin;
23
use futures_core::future::{FusedFuture, Future};
34
use futures_core::task::{self, Poll};
4-
use futures_core::never::Never;
55
use pin_utils::unsafe_pinned;
66

77
/// Future for the [`never_error`](super::FutureExt::never_error) combinator.

futures-util/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ pub mod sink;
112112

113113
pub mod task;
114114

115+
pub mod never;
116+
#[doc(hidden)] pub use crate::never::Never;
117+
115118
#[cfg(feature = "compat")]
116119
pub mod compat;
117120

File renamed without changes.

futures-util/src/sink/drain.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use crate::never::Never;
12
use core::marker::PhantomData;
23
use core::pin::Pin;
34
use futures_core::task::{Context, Poll};
4-
use futures_core::never::Never;
55
use futures_sink::Sink;
66

77
/// Sink for the [`drain`] function.

futures/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ compile_error!("The `bilock` feature requires the `unstable` feature as an expli
6262

6363
#[doc(hidden)] pub use futures_core::task::Poll;
6464

65-
#[doc(hidden)] pub use futures_core::never::Never;
65+
#[doc(hidden)] pub use futures_util::never::Never;
6666

6767
// Macro reexports
6868
pub use futures_core::ready; // Readiness propagation
@@ -519,7 +519,7 @@ pub mod never {
519519
//!
520520
//! Values of this type can never be created and will never exist.
521521
522-
pub use futures_core::never::Never;
522+
pub use futures_util::never::Never;
523523
}
524524

525525
// proc-macro re-export --------------------------------------

0 commit comments

Comments
 (0)