From f288ef92dc683801f31bf28380118be9e977b13e Mon Sep 17 00:00:00 2001 From: Zac Pullar-Strecker Date: Wed, 2 Oct 2019 13:19:50 +1300 Subject: [PATCH] Revert "Expose ContentDisposition in actix-multipart to fix broken doc link" This reverts commit e90d71d16cb552cd3e1745646fabcc48e0b4e379. --- actix-multipart/src/lib.rs | 4 ---- actix-multipart/src/server.rs | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/actix-multipart/src/lib.rs b/actix-multipart/src/lib.rs index 87347fd8d..43eb048ca 100644 --- a/actix-multipart/src/lib.rs +++ b/actix-multipart/src/lib.rs @@ -6,7 +6,3 @@ mod server; pub use self::error::MultipartError; pub use self::server::{Field, Multipart}; - -pub mod headers { - pub use actix_web::http::header::{ContentDisposition, DispositionType, DispositionParam}; -} diff --git a/actix-multipart/src/server.rs b/actix-multipart/src/server.rs index 4f73b044c..a7c787f46 100644 --- a/actix-multipart/src/server.rs +++ b/actix-multipart/src/server.rs @@ -12,12 +12,11 @@ use mime; use actix_web::error::{ParseError, PayloadError}; use actix_web::http::header::{ - self, HeaderMap, HeaderName, HeaderValue, + self, ContentDisposition, HeaderMap, HeaderName, HeaderValue, }; use actix_web::http::HttpTryFrom; use crate::error::MultipartError; -use crate::headers::ContentDisposition; const MAX_HEADERS: usize = 32;