From c3461b3ef3866f6335596d1882a52343cef0bcb5 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Thu, 5 Dec 2019 15:03:04 -0500
Subject: [PATCH] time: impl From between std / tokio Instants (#1904)

---
 tokio/src/time/instant.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tokio/src/time/instant.rs b/tokio/src/time/instant.rs
index faf7b1084..ebe991d08 100644
--- a/tokio/src/time/instant.rs
+++ b/tokio/src/time/instant.rs
@@ -126,6 +126,18 @@ impl Instant {
     }
 }
 
+impl From<std::time::Instant> for Instant {
+    fn from(time: std::time::Instant) -> Instant {
+        Instant::from_std(time)
+    }
+}
+
+impl From<Instant> for std::time::Instant {
+    fn from(time: Instant) -> std::time::Instant {
+        time.into_std()
+    }
+}
+
 impl ops::Add<Duration> for Instant {
     type Output = Instant;