berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

Update actix-utils to tokio 0.2

This commit is contained in:
Martell Malone 2019-11-28 02:31:02 -08:00
parent dca7cad09d
commit 99e0a45d0d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actix-utils/src/keepalive.rs
View File

@ -3,9 +3,9 @@ use std::future::Future;
use std::marker::PhantomData; use std::marker::PhantomData;
use std::pin::Pin; use std::pin::Pin;
use std::task::{Context, Poll}; 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 actix_service::{Service, ServiceFactory};
use futures::future::{ok, Ready}; use futures::future::{ok, Ready};
@ -87,7 +87,7 @@ where
ka, ka,
time, time,
expire, expire,
delay: delay(expire), delay: delay_until(expire),
_t: PhantomData, _t: PhantomData,
} }
} }

4
actix-utils/src/time.rs
View File

@ -1,8 +1,8 @@
use std::convert::Infallible; use std::convert::Infallible;
use std::task::{Context, Poll}; 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 actix_service::{Service, ServiceFactory};
use futures::future::{ok, ready, FutureExt, Ready}; use futures::future::{ok, ready, FutureExt, Ready};