From e76ea8e80ccf7a5abf6cad8b4c30010dfc690b90 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Tue, 26 Nov 2019 09:04:14 +0600
Subject: [PATCH] re-export timeout

---
 actix-rt/CHANGES.md | 2 +-
 actix-rt/src/lib.rs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md
index 27fefc3b..9a165528 100644
--- a/actix-rt/CHANGES.md
+++ b/actix-rt/CHANGES.md
@@ -6,7 +6,7 @@ Added
 
 * Export `main` and `test` attribute macros
 
-* Export `timer` module (re-export of tokio-timer)
+* Export `time` module (re-export of tokio-timer)
 
 
 ## [1.0.0-alpha.1] - 2019-11-22
diff --git a/actix-rt/src/lib.rs b/actix-rt/src/lib.rs
index 014b05fd..e5d783bb 100644
--- a/actix-rt/src/lib.rs
+++ b/actix-rt/src/lib.rs
@@ -37,6 +37,7 @@ pub mod time {
 
     pub use tokio_timer::Interval;
     pub use tokio_timer::{delay, delay_for, Delay};
+    pub use tokio_timer::{timeout, Timeout};
 
     /// Creates new `Interval` that yields with interval of `duration`. The first
     /// tick completes immediately.