cargo fmt

Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>

Author: yoshuawuyts

src/io/timeout.rs

@@ -1,8 +1,6 @@
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::time::Duration;
-use std::task::{Context, Poll};
-use std::pin::Pin;
 
 use futures_timer::Delay;
 use pin_utils::unsafe_pinned;
@@ -41,7 +39,8 @@ where
     Timeout {
         timeout: Delay::new(dur),
         future: f,
-    }.await
+    }
+    .await
 }
 
 /// Future returned by the `FutureExt::timeout` method.
@@ -63,7 +62,6 @@ where
 }
 
 impl<F, T> Future for Timeout<F, T>
->>>>>>> 01f8584... add stream::interval
 where
     F: Future<Output = io::Result<T>>,
 {