1
0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-24 00:21:08 +01:00

use actix ready future in remaining return types

This commit is contained in:
Rob Ede 2021-11-30 13:11:41 +00:00
parent fa82b698b7
commit a978b417f3
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
3 changed files with 5 additions and 6 deletions

View File

@ -24,7 +24,8 @@ experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
[dependencies] [dependencies]
actix-web = { version = "4.0.0-beta.11", default-features = false } actix-web = { version = "4.0.0-beta.11", default-features = false }
actix-http = "3.0.0-beta.13" actix-http = "3.0.0-beta.13"
actix-service = "2.0.0" actix-service = "2"
actix-utils = "3"
askama_escape = "0.10" askama_escape = "0.10"
bitflags = "1" bitflags = "1"

View File

@ -1,9 +1,9 @@
use std::{ use std::{
future::{ready, Ready},
path::{Path, PathBuf}, path::{Path, PathBuf},
str::FromStr, str::FromStr,
}; };
use actix_utils::future::{ready, Ready};
use actix_web::{dev::Payload, FromRequest, HttpRequest}; use actix_web::{dev::Payload, FromRequest, HttpRequest};
use crate::error::UriSegmentError; use crate::error::UriSegmentError;

View File

@ -286,12 +286,10 @@ where
} }
#[cfg(feature = "dangerous-h2c")] #[cfg(feature = "dangerous-h2c")]
{ {
use std::{ use std::io;
future::{ready, Ready},
io,
};
use actix_tls::connect::Connection; use actix_tls::connect::Connection;
use actix_utils::future::{ready, Ready};
impl IntoConnectionIo for TcpConnection<Uri, Box<dyn ConnectionIo>> { impl IntoConnectionIo for TcpConnection<Uri, Box<dyn ConnectionIo>> {
fn into_connection_io(self) -> (Box<dyn ConnectionIo>, Protocol) { fn into_connection_io(self) -> (Box<dyn ConnectionIo>, Protocol) {