Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move Never type from futures-core to futures-util #1836

Merged
merged 1 commit into from
Aug 29, 2019
Merged

Move Never type from futures-core to futures-util #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions futures-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ pub mod stream;
pub mod task;
#[doc(hidden)] pub use self::task::Poll;

pub mod never;
#[doc(hidden)] pub use self::never::Never;

#[doc(hidden)]
pub mod core_reexport {
#[doc(hidden)]
Expand Down
2 changes: 1 addition & 1 deletion futures-util/src/future/never_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::never::Never;
use core::pin::Pin;
use futures_core::future::{FusedFuture, Future};
use futures_core::task::{self, Poll};
use futures_core::never::Never;
use pin_utils::unsafe_pinned;

/// Future for the [`never_error`](super::FutureExt::never_error) combinator.
Expand Down
3 changes: 3 additions & 0 deletions futures-util/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ pub mod sink;

pub mod task;

pub mod never;
#[doc(hidden)] pub use crate::never::Never;

#[cfg(feature = "compat")]
pub mod compat;

Expand Down
0 futures-core/src/never.rs → futures-util/src/never.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion futures-util/src/sink/drain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::never::Never;
use core::marker::PhantomData;
use core::pin::Pin;
use futures_core::task::{Context, Poll};
use futures_core::never::Never;
use futures_sink::Sink;

/// Sink for the [`drain`] function.
Expand Down
4 changes: 2 additions & 2 deletions futures/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ compile_error!("The `bilock` feature requires the `unstable` feature as an expli

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

#[doc(hidden)] pub use futures_core::never::Never;
#[doc(hidden)] pub use futures_util::never::Never;

// Macro reexports
pub use futures_core::ready; // Readiness propagation
Expand Down Expand Up @@ -519,7 +519,7 @@ pub mod never {
//!
//! Values of this type can never be created and will never exist.

pub use futures_core::never::Never;
pub use futures_util::never::Never;
}

// proc-macro re-export --------------------------------------
Expand Down