rustfmt + simpler Debugs

Signed-off-by: Yoshua Wuyts <[email protected]>

Author: yoshuawuyts

runtime-native/Cargo.toml

@@ -21,7 +21,7 @@ async-datagram = "2.2.0"
 juliex = "0.3.0-alpha.6"
 lazy_static = "1.3.0"
 romio = "0.3.0-alpha.7"
-futures-timer = "0.2.0"
+futures-timer = "0.2.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 futures01 = { package = "futures", version = "0.1" }

runtime-native/src/not_wasm32/time.rs

@@ -1,11 +1,11 @@
-use std::fmt;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::time::Instant;
 
 use futures::prelude::*;
 use futures_timer::{Delay as AsyncDelay, Interval as AsyncInterval};
 
+#[derive(Debug)]
 pub(crate) struct Delay {
     pub(crate) async_delay: AsyncDelay,
 }
@@ -22,16 +22,7 @@ impl Future for Delay {
     }
 }
 
-// TODO: implement this
-impl fmt::Debug for Delay {
-    // fmt::Display::fmt(self.async_delay, f)
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        f.debug_struct("Delay")
-            .field("when", &"...")
-            .finish()
-    }
-}
-
+#[derive(Debug)]
 pub(crate) struct Interval {
     pub(crate) async_interval: AsyncInterval,
 }
@@ -47,14 +38,3 @@ impl Stream for Interval {
         Poll::Ready(Some(Instant::now()))
     }
 }
-
-// TODO: implement this
-impl fmt::Debug for Interval {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        // fmt::Display::fmt(self.async_interval, f)
-        f.debug_struct("Interval")
-            .field("delay", &"...")
-            .field("interval", &"...")
-            .finish()
-    }
-}

runtime-tokio/src/lib.rs

@@ -26,12 +26,12 @@ use std::thread;
 use std::time::{Duration, Instant};
 
 mod tcp;
-mod udp;
 mod time;
+mod udp;
 
 use tcp::{TcpListener, TcpStream};
-use udp::UdpSocket;
 use time::{Delay, Interval};
+use udp::UdpSocket;
 
 /// The default Tokio runtime.
 #[derive(Debug)]

runtime-tokio/src/time.rs

@@ -1,4 +1,3 @@
-use std::fmt;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::time::Instant;
@@ -7,6 +6,7 @@ use futures::compat::Compat01As03;
 use futures::prelude::*;
 use tokio::timer::{Delay as TokioDelay, Interval as TokioInterval};
 
+#[derive(Debug)]
 pub(crate) struct Delay {
     pub(crate) tokio_delay: TokioDelay,
 }
@@ -24,12 +24,7 @@ impl Future for Delay {
     }
 }
 
-impl fmt::Debug for Delay {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        fmt::Debug::fmt(&self.tokio_delay, f)
-    }
-}
-
+#[derive(Debug)]
 pub(crate) struct Interval {
     pub(crate) tokio_interval: TokioInterval,
 }
@@ -43,13 +38,9 @@ impl Stream for Interval {
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
         let mut stream = Compat01As03::new(&mut self.tokio_interval);
         // https://docs.rs/tokio/0.1.20/tokio/timer/struct.Error.html
-        futures::ready!(Pin::new(&mut stream).poll_next(cx)).unwrap().unwrap();
+        futures::ready!(Pin::new(&mut stream).poll_next(cx))
+            .unwrap()
+            .unwrap();
         Poll::Ready(Some(Instant::now()))
     }
 }
-
-impl fmt::Debug for Interval {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        fmt::Debug::fmt(&self.tokio_interval, f)
-    }
-}