Merge 5ad04e6de7 into 219b988300

actix-web/CHANGES.md

@@ -5,7 +5,6 @@
 - `actix_web::response::builder::HttpResponseBuilder::streaming()` now sets `Content-Type` to `application/octet-stream` if `Content-Type` does not exist.
 - `actix_web::response::builder::HttpResponseBuilder::streaming()` now calls `actix_web::response::builder::HttpResponseBuilder::no_chunking()` if `Content-Length` is set by user.
 - Add `ws` crate feature (on-by-default) which forwards to `actix-http` and guards some of its `ResponseError` impls.
-- Add public export for `EitherExtractError` in `error` module.
 
 ## 4.11.0
 

actix-web/src/error/mod.rs

@@ -21,7 +21,6 @@ mod response_error;
 
 pub(crate) use self::macros::{downcast_dyn, downcast_get_type_id};
 pub use self::{error::Error, internal::*, response_error::ResponseError};
-pub use crate::types::EitherExtractError;
 
 /// A convenience [`Result`](std::result::Result) for Actix Web operations.
 ///

actix-web/src/types/mod.rs

@@ -11,7 +11,7 @@ mod query;
 mod readlines;
 
 pub use self::{
-    either::{Either, EitherExtractError},
+    either::Either,
     form::{Form, FormConfig, UrlEncoded},
     header::Header,
     html::Html,