chiark / gitweb /
actix cleanup: import futures::future
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 28 Mar 2022 00:36:56 +0000 (01:36 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 28 Mar 2022 00:36:56 +0000 (01:36 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
daemon/main.rs

index 2d5113feb4b9f60b53914979a8cc6174e798aa7d..157785be9b0c2ab5e662219c572650f962a70a68 100644 (file)
@@ -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()