Skip to content

Commit b6a2a53

Browse files
committed
format
Signed-off-by: tison <[email protected]>
1 parent 80899dc commit b6a2a53

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

futures-channel/tests/mpsc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
use std::pin::pin;
21
use futures::channel::{mpsc, oneshot};
32
use futures::executor::{block_on, block_on_stream};
43
use futures::future::{poll_fn, FutureExt};
54
use futures::sink::{Sink, SinkExt};
65
use futures::stream::{Stream, StreamExt};
76
use futures::task::{Context, Poll};
87
use futures_test::task::{new_count_waker, noop_context};
8+
use std::pin::pin;
99
use std::sync::atomic::{AtomicUsize, Ordering};
1010
use std::sync::{Arc, Mutex};
1111
use std::thread;

futures-util/src/future/future/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
//! This module contains a number of functions for working with `Future`s,
44
//! including the `FutureExt` trait which adds methods to `Future` types.
55
6+
use crate::fns::{inspect_fn, into_fn, ok_fn, InspectFn, IntoFn, OkFn};
7+
use crate::future::{assert_future, Either};
8+
use crate::stream::assert_stream;
69
#[cfg(feature = "alloc")]
710
use alloc::boxed::Box;
811
use core::convert::Infallible;
12+
use core::pin::pin;
913
use core::pin::Pin;
10-
use std::pin::pin;
11-
use crate::fns::{inspect_fn, into_fn, ok_fn, InspectFn, IntoFn, OkFn};
12-
use crate::future::{assert_future, Either};
13-
use crate::stream::assert_stream;
1414
#[cfg(feature = "alloc")]
1515
use futures_core::future::{BoxFuture, LocalBoxFuture};
1616
use futures_core::{
@@ -26,7 +26,7 @@ mod fuse;
2626
mod map;
2727

2828
delegate_all!(
29-
/// Future for the [`flatten`](super::FutureExt::flatten) method.
29+
/// Future for the [`flatten`](FutureExt::flatten) method.
3030
Flatten<F>(
3131
flatten::Flatten<F, <F as Future>::Output>
3232
): Debug + Future + FusedFuture + New[|x: F| flatten::Flatten::new(x)]
@@ -44,7 +44,7 @@ delegate_all!(
4444
pub use fuse::Fuse;
4545

4646
delegate_all!(
47-
/// Future for the [`map`](super::FutureExt::map) method.
47+
/// Future for the [`map`](FutureExt::map) method.
4848
Map<Fut, F>(
4949
map::Map<Fut, F>
5050
): Debug + Future + FusedFuture + New[|x: Fut, f: F| map::Map::new(x, f)]
@@ -79,14 +79,14 @@ delegate_all!(
7979
);
8080

8181
delegate_all!(
82-
/// Future for the [`never_error`](super::FutureExt::never_error) combinator.
82+
/// Future for the [`never_error`](FutureExt::never_error) combinator.
8383
NeverError<Fut>(
8484
Map<Fut, OkFn<Infallible>>
8585
): Debug + Future + FusedFuture + New[|x: Fut| Map::new(x, ok_fn())]
8686
);
8787

8888
delegate_all!(
89-
/// Future for the [`unit_error`](super::FutureExt::unit_error) combinator.
89+
/// Future for the [`unit_error`](FutureExt::unit_error) combinator.
9090
UnitError<Fut>(
9191
Map<Fut, OkFn<()>>
9292
): Debug + Future + FusedFuture + New[|x: Fut| Map::new(x, ok_fn())]

futures/tests/async_await_macros.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ use futures::future::{self, poll_fn, FutureExt};
44
use futures::sink::SinkExt;
55
use futures::stream::StreamExt;
66
use futures::task::{Context, Poll};
7-
use futures::{
8-
join, pending, poll, select, select_biased, stream, stream_select, try_join,
9-
};
7+
use futures::{join, pending, poll, select, select_biased, stream, stream_select, try_join};
108
use std::pin::pin;
119

1210
#[test]

futures/tests/io_buf_reader.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ fn test_buffered_reader_seek() {
156156
block_on(async {
157157
let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
158158
let reader = BufReader::with_capacity(2, Cursor::new(inner));
159-
let mut reader = pin!(reader);
159+
let mut reader = pin!(reader);
160160

161161
assert_eq!(reader.seek(SeekFrom::Start(3)).await.unwrap(), 3);
162162
assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[0, 1][..]);
@@ -174,7 +174,7 @@ fn test_buffered_reader_seek_relative() {
174174
block_on(async {
175175
let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
176176
let reader = BufReader::with_capacity(2, Cursor::new(inner));
177-
let mut reader = pin!(reader);
177+
let mut reader = pin!(reader);
178178

179179
assert!(reader.as_mut().seek_relative(3).await.is_ok());
180180
assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[0, 1][..]);
@@ -194,7 +194,7 @@ fn test_buffered_reader_invalidated_after_read() {
194194
block_on(async {
195195
let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
196196
let reader = BufReader::with_capacity(3, Cursor::new(inner));
197-
let mut reader = pin!(reader);
197+
let mut reader = pin!(reader);
198198

199199
assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[5, 6, 7][..]);
200200
reader.as_mut().consume(3);
@@ -215,7 +215,7 @@ fn test_buffered_reader_invalidated_after_seek() {
215215
block_on(async {
216216
let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
217217
let reader = BufReader::with_capacity(3, Cursor::new(inner));
218-
let mut reader = pin!(reader);
218+
let mut reader = pin!(reader);
219219

220220
assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[5, 6, 7][..]);
221221
reader.as_mut().consume(3);
@@ -264,7 +264,7 @@ fn test_buffered_reader_seek_underflow() {
264264

265265
block_on(async {
266266
let reader = BufReader::with_capacity(5, AllowStdIo::new(PositionReader { pos: 0 }));
267-
let mut reader = pin!(reader);
267+
let mut reader = pin!(reader);
268268
assert_eq!(reader.as_mut().fill_buf().await.unwrap(), &[0, 1, 2, 3, 4][..]);
269269
assert_eq!(reader.seek(SeekFrom::End(-5)).await.unwrap(), u64::MAX - 5);
270270
assert_eq!(reader.as_mut().fill_buf().await.unwrap().len(), 5);
@@ -418,7 +418,7 @@ fn maybe_pending_seek() {
418418

419419
let inner: &[u8] = &[5, 6, 7, 0, 1, 2, 3, 4];
420420
let reader = BufReader::with_capacity(2, MaybePendingSeek::new(inner));
421-
let mut reader = pin!(reader);
421+
let mut reader = pin!(reader);
422422

423423
assert_eq!(run(reader.seek(SeekFrom::Current(3))).ok(), Some(3));
424424
assert_eq!(run(reader.as_mut().fill_buf()).ok(), Some(&[0, 1][..]));

futures/tests/stream_peekable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use std::pin::pin;
21
use futures::executor::block_on;
32
use futures::stream::{self, Peekable, StreamExt};
3+
use std::pin::pin;
44

55
#[test]
66
fn peekable() {

0 commit comments

Comments
 (0)