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

remove extra export of HeaderMap

This commit is contained in:
fakeshadow 2021-01-20 04:35:54 +08:00
parent 2cb2a30949
commit 9768ea4dd1
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actix-http/Cargo.toml
View File

@ -56,7 +56,7 @@ derive_more = "0.99.5"
either = "1.5.3" either = "1.5.3"
encoding_rs = "0.8" encoding_rs = "0.8"
futures-channel = { version = "0.3.7", default-features = false, features = ["alloc"] } futures-channel = { version = "0.3.7", default-features = false, features = ["alloc"] }
futures-core = { version = "0.3.7", default-features = false } futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
futures-util = { version = "0.3.7", default-features = false, features = ["alloc", "sink"] } futures-util = { version = "0.3.7", default-features = false, features = ["alloc", "sink"] }
ahash = "0.6" ahash = "0.6"
h2 = "0.3.0" h2 = "0.3.0"

1
actix-http/src/lib.rs
View File

@ -44,7 +44,6 @@ pub use self::builder::HttpServiceBuilder;
pub use self::config::{KeepAlive, ServiceConfig}; pub use self::config::{KeepAlive, ServiceConfig};
pub use self::error::{Error, ResponseError, Result}; pub use self::error::{Error, ResponseError, Result};
pub use self::extensions::Extensions; pub use self::extensions::Extensions;
pub use self::header::HeaderMap;
pub use self::httpmessage::HttpMessage; pub use self::httpmessage::HttpMessage;
pub use self::message::{Message, RequestHead, RequestHeadType, ResponseHead}; pub use self::message::{Message, RequestHead, RequestHeadType, ResponseHead};
pub use self::payload::{Payload, PayloadStream}; pub use self::payload::{Payload, PayloadStream};

3
awc/src/client/h1proto.rs
View File

@ -13,8 +13,7 @@ use futures_util::{pin_mut, SinkExt, StreamExt};
use actix_http::body::{BodySize, MessageBody}; use actix_http::body::{BodySize, MessageBody};
use actix_http::error::PayloadError; use actix_http::error::PayloadError;
use actix_http::h1; use actix_http::h1;
use actix_http::http::header::{IntoHeaderValue, HOST}; use actix_http::http::header::{HeaderMap, IntoHeaderValue, HOST};
use actix_http::HeaderMap;
use actix_http::{Payload, PayloadStream}; use actix_http::{Payload, PayloadStream};
use actix_http::{RequestHeadType, ResponseHead}; use actix_http::{RequestHeadType, ResponseHead};

5
awc/src/client/h2proto.rs
View File

@ -10,11 +10,12 @@ use h2::{
client::{Builder, Connection, SendRequest}, client::{Builder, Connection, SendRequest},
SendStream, SendStream,
}; };
use http::header::{HeaderValue, CONNECTION, CONTENT_LENGTH, TRANSFER_ENCODING};
use http::{request::Request, Method, Version}; use http::{request::Request, Method, Version};
use actix_http::body::{BodySize, MessageBody}; use actix_http::body::{BodySize, MessageBody};
use actix_http::HeaderMap; use actix_http::http::header::{
HeaderMap, HeaderValue, CONNECTION, CONTENT_LENGTH, TRANSFER_ENCODING,
};
use actix_http::Payload; use actix_http::Payload;
use actix_http::{RequestHeadType, ResponseHead}; use actix_http::{RequestHeadType, ResponseHead};

3
awc/src/client/pool.rs
View File

@ -12,7 +12,8 @@ use actix_service::Service;
use actix_utils::task::LocalWaker; use actix_utils::task::LocalWaker;
use ahash::AHashMap; use ahash::AHashMap;
use bytes::Bytes; use bytes::Bytes;
use futures_util::future::{poll_fn, FutureExt, LocalBoxFuture}; use futures_core::future::LocalBoxFuture;
use futures_util::future::{poll_fn, FutureExt};
use h2::client::{Connection, SendRequest}; use h2::client::{Connection, SendRequest};
use http::uri::Authority; use http::uri::Authority;
use indexmap::IndexSet; use indexmap::IndexSet;

3
awc/tests/test_client.rs
View File

@ -718,10 +718,9 @@ async fn test_client_cookie_handling() {
#[actix_rt::test] #[actix_rt::test]
async fn client_unread_response() { async fn client_unread_response() {
let addr = test::unused_addr(); let addr = test::unused_addr();
let lst = std::net::TcpListener::bind(addr).unwrap();
std::thread::spawn(move || { std::thread::spawn(move || {
let lst = std::net::TcpListener::bind(addr).unwrap();
for stream in lst.incoming() { for stream in lst.incoming() {
let mut stream = stream.unwrap(); let mut stream = stream.unwrap();
let mut b = [0; 1000]; let mut b = [0; 1000];