From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 28 Mar 2022 00:36:56 +0000 (+0100)
Subject: actix cleanup: import futures::future
X-Git-Tag: otter-1.0.0~94
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e52b80069e3a2371ef5e2e19508122c2531a291c;p=otter.git

actix cleanup: import futures::future

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/daemon/main.rs b/daemon/main.rs
index 2d5113fe..157785be 100644
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -15,6 +15,7 @@ pub mod session;
 pub mod sse;
 
 pub use std::pin::Pin;
+pub use futures::future;
 
 pub use crate::api::InstanceAccess;
 pub use crate::api::{FatalErrorResponse};
@@ -213,11 +214,11 @@ where T: FromStr,
       T::Err: Into<E>
 //      T::Error: Debug,
 {
-  type Future = futures::future::Ready<Result<WholeQueryString<T,E>, E>>;
+  type Future = future::Ready<Result<WholeQueryString<T,E>, E>>;
   type Error = E;
   fn from_request(req: &HttpRequest, _: &mut actix_web::dev::Payload)
                   -> Self::Future {
-    futures::future::ready(
+    future::ready(
       req.uri().query()
         .map(|s| s.parse())
         .transpose()