Skip to content

Commit d9ced4e

Browse files
taiki-ecramertj
authored andcommitted
Re-export pin_mut! macro for convenience
1 parent 744ece9 commit d9ced4e

File tree

7 files changed

+7
-6
lines changed

7 files changed

+7
-6
lines changed

futures-channel/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.16",
2424
[dev-dependencies]
2525
futures-preview = { path = "../futures", version = "=0.3.0-alpha.16", default-features = true }
2626
futures-test-preview = { path = "../futures-test", version = "=0.3.0-alpha.16", default-features = true }
27-
pin-utils = "0.1.0-alpha.4"

futures-channel/tests/mpsc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use futures::future::{FutureExt, poll_fn};
66
use futures::stream::{Stream, StreamExt};
77
use futures::sink::{Sink, SinkExt};
88
use futures::task::{Context, Poll};
9+
use futures::pin_mut;
910
use futures_test::task::{new_count_waker, noop_context};
10-
use pin_utils::pin_mut;
1111
use std::sync::{Arc, Mutex};
1212
use std::sync::atomic::{AtomicUsize, Ordering};
1313
use std::thread;

futures-executor/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ futures-core-preview = { path = "../futures-core", version = "=0.3.0-alpha.16",
2323
futures-util-preview = { path = "../futures-util", version = "=0.3.0-alpha.16", default-features = false}
2424
futures-channel-preview = { path = "../futures-channel", version = "=0.3.0-alpha.16", default-features = false}
2525
num_cpus = { version = "1.8.0", optional = true }
26-
pin-utils = "0.1.0-alpha.4"
2726

2827
[dev-dependencies]
2928
futures-preview = { path = "../futures", version = "=0.3.0-alpha.16" }

futures-executor/src/local_pool.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use futures_core::task::{Context, Poll, Spawn, LocalSpawn, SpawnError};
55
use futures_util::task::{waker_ref, ArcWake};
66
use futures_util::stream::FuturesUnordered;
77
use futures_util::stream::StreamExt;
8-
use pin_utils::pin_mut;
8+
use futures_util::pin_mut;
99
use std::cell::{RefCell};
1010
use std::ops::{Deref, DerefMut};
1111
use std::rc::{Rc, Weak};

futures-util/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ extern crate alloc;
3030
#[macro_use]
3131
mod macros;
3232

33+
// Re-export pin_mut! for convenience
34+
pub use pin_utils::pin_mut;
35+
3336
#[cfg(feature = "async-await")]
3437
#[macro_use]
3538
#[doc(hidden)]

futures/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ compile_error!("The `never-type` feature requires the `nightly` feature as an ex
6767
#[doc(hidden)] pub use futures_core::task::Poll;
6868

6969
// Macro reexports
70+
pub use futures_util::pin_mut;
7071
pub use futures_util::ready; // Readiness propagation
7172
#[cfg(feature = "async-await")]
7273
pub use futures_util::{

futures/tests/async_await_macros.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#![recursion_limit="128"]
22
#![feature(async_await)]
33

4-
use futures::{Poll, pending, poll, join, try_join, select};
4+
use futures::{Poll, pending, pin_mut, poll, join, try_join, select};
55
use futures::channel::{mpsc, oneshot};
66
use futures::executor::block_on;
77
use futures::future::{self, FutureExt};
88
use futures::stream::StreamExt;
99
use futures::sink::SinkExt;
10-
use pin_utils::pin_mut;
1110

1211
#[test]
1312
fn poll_and_pending() {

0 commit comments

Comments
 (0)