From 99e0a45d0d3b3146a9f18f70cdf4c1d1cc3f81d5 Mon Sep 17 00:00:00 2001
From: Martell Malone <martellmalone@gmail.com>
Date: Thu, 28 Nov 2019 02:31:02 -0800
Subject: [PATCH] Update actix-utils to tokio 0.2

---
 actix-utils/src/keepalive.rs | 6 +++---
 actix-utils/src/time.rs      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actix-utils/src/keepalive.rs b/actix-utils/src/keepalive.rs
index e113f818..0cc9380d 100644
--- a/actix-utils/src/keepalive.rs
+++ b/actix-utils/src/keepalive.rs
@@ -3,9 +3,9 @@ use std::future::Future;
 use std::marker::PhantomData;
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use std::time::{Duration, Instant};
+use std::time::Duration;
 
-use actix_rt::time::{delay, Delay};
+use actix_rt::time::{delay_until, Delay, Instant};
 use actix_service::{Service, ServiceFactory};
 use futures::future::{ok, Ready};
 
@@ -87,7 +87,7 @@ where
             ka,
             time,
             expire,
-            delay: delay(expire),
+            delay: delay_until(expire),
             _t: PhantomData,
         }
     }
diff --git a/actix-utils/src/time.rs b/actix-utils/src/time.rs
index d832d4d2..e1b0791a 100644
--- a/actix-utils/src/time.rs
+++ b/actix-utils/src/time.rs
@@ -1,8 +1,8 @@
 use std::convert::Infallible;
 use std::task::{Context, Poll};
-use std::time::{self, Duration, Instant};
+use std::time::{self, Duration};
 
-use actix_rt::time::delay_for;
+use actix_rt::time::{delay_for, Instant};
 use actix_service::{Service, ServiceFactory};
 use futures::future::{ok, ready, FutureExt, Ready};