From db2b062c13fc4fafc7046b96d7e85102b785f9d5 Mon Sep 17 00:00:00 2001 From: ibraheemdev Date: Sun, 21 Mar 2021 11:40:03 -0400 Subject: [PATCH] move common headers to actix-web/http --- src/{types => http}/header/accept.rs | 0 src/{types => http}/header/accept_charset.rs | 0 src/{types => http}/header/accept_encoding.rs | 0 src/{types => http}/header/accept_language.rs | 0 src/{types => http}/header/allow.rs | 0 src/{types => http}/header/cache_control.rs | 0 src/{types => http}/header/content_disposition.rs | 0 src/{types => http}/header/content_language.rs | 0 src/{types => http}/header/content_range.rs | 0 src/{types => http}/header/content_type.rs | 0 src/{types => http}/header/date.rs | 0 src/{types => http}/header/etag.rs | 0 src/{types => http}/header/expires.rs | 0 src/{types => http}/header/if_match.rs | 0 src/{types => http}/header/if_modified_since.rs | 0 src/{types => http}/header/if_none_match.rs | 0 src/{types => http}/header/if_range.rs | 0 src/{types => http}/header/if_unmodified_since.rs | 0 src/{types => http}/header/last_modified.rs | 0 src/{types => http}/header/mod.rs | 0 src/{types => http}/header/range.rs | 0 src/{types => http}/header/utils.rs | 0 src/http/mod.rs | 2 ++ src/lib.rs | 6 +----- src/types/mod.rs | 1 - 25 files changed, 3 insertions(+), 6 deletions(-) rename src/{types => http}/header/accept.rs (100%) rename src/{types => http}/header/accept_charset.rs (100%) rename src/{types => http}/header/accept_encoding.rs (100%) rename src/{types => http}/header/accept_language.rs (100%) rename src/{types => http}/header/allow.rs (100%) rename src/{types => http}/header/cache_control.rs (100%) rename src/{types => http}/header/content_disposition.rs (100%) rename src/{types => http}/header/content_language.rs (100%) rename src/{types => http}/header/content_range.rs (100%) rename src/{types => http}/header/content_type.rs (100%) rename src/{types => http}/header/date.rs (100%) rename src/{types => http}/header/etag.rs (100%) rename src/{types => http}/header/expires.rs (100%) rename src/{types => http}/header/if_match.rs (100%) rename src/{types => http}/header/if_modified_since.rs (100%) rename src/{types => http}/header/if_none_match.rs (100%) rename src/{types => http}/header/if_range.rs (100%) rename src/{types => http}/header/if_unmodified_since.rs (100%) rename src/{types => http}/header/last_modified.rs (100%) rename src/{types => http}/header/mod.rs (100%) rename src/{types => http}/header/range.rs (100%) rename src/{types => http}/header/utils.rs (100%) create mode 100644 src/http/mod.rs diff --git a/src/types/header/accept.rs b/src/http/header/accept.rs similarity index 100% rename from src/types/header/accept.rs rename to src/http/header/accept.rs diff --git a/src/types/header/accept_charset.rs b/src/http/header/accept_charset.rs similarity index 100% rename from src/types/header/accept_charset.rs rename to src/http/header/accept_charset.rs diff --git a/src/types/header/accept_encoding.rs b/src/http/header/accept_encoding.rs similarity index 100% rename from src/types/header/accept_encoding.rs rename to src/http/header/accept_encoding.rs diff --git a/src/types/header/accept_language.rs b/src/http/header/accept_language.rs similarity index 100% rename from src/types/header/accept_language.rs rename to src/http/header/accept_language.rs diff --git a/src/types/header/allow.rs b/src/http/header/allow.rs similarity index 100% rename from src/types/header/allow.rs rename to src/http/header/allow.rs diff --git a/src/types/header/cache_control.rs b/src/http/header/cache_control.rs similarity index 100% rename from src/types/header/cache_control.rs rename to src/http/header/cache_control.rs diff --git a/src/types/header/content_disposition.rs b/src/http/header/content_disposition.rs similarity index 100% rename from src/types/header/content_disposition.rs rename to src/http/header/content_disposition.rs diff --git a/src/types/header/content_language.rs b/src/http/header/content_language.rs similarity index 100% rename from src/types/header/content_language.rs rename to src/http/header/content_language.rs diff --git a/src/types/header/content_range.rs b/src/http/header/content_range.rs similarity index 100% rename from src/types/header/content_range.rs rename to src/http/header/content_range.rs diff --git a/src/types/header/content_type.rs b/src/http/header/content_type.rs similarity index 100% rename from src/types/header/content_type.rs rename to src/http/header/content_type.rs diff --git a/src/types/header/date.rs b/src/http/header/date.rs similarity index 100% rename from src/types/header/date.rs rename to src/http/header/date.rs diff --git a/src/types/header/etag.rs b/src/http/header/etag.rs similarity index 100% rename from src/types/header/etag.rs rename to src/http/header/etag.rs diff --git a/src/types/header/expires.rs b/src/http/header/expires.rs similarity index 100% rename from src/types/header/expires.rs rename to src/http/header/expires.rs diff --git a/src/types/header/if_match.rs b/src/http/header/if_match.rs similarity index 100% rename from src/types/header/if_match.rs rename to src/http/header/if_match.rs diff --git a/src/types/header/if_modified_since.rs b/src/http/header/if_modified_since.rs similarity index 100% rename from src/types/header/if_modified_since.rs rename to src/http/header/if_modified_since.rs diff --git a/src/types/header/if_none_match.rs b/src/http/header/if_none_match.rs similarity index 100% rename from src/types/header/if_none_match.rs rename to src/http/header/if_none_match.rs diff --git a/src/types/header/if_range.rs b/src/http/header/if_range.rs similarity index 100% rename from src/types/header/if_range.rs rename to src/http/header/if_range.rs diff --git a/src/types/header/if_unmodified_since.rs b/src/http/header/if_unmodified_since.rs similarity index 100% rename from src/types/header/if_unmodified_since.rs rename to src/http/header/if_unmodified_since.rs diff --git a/src/types/header/last_modified.rs b/src/http/header/last_modified.rs similarity index 100% rename from src/types/header/last_modified.rs rename to src/http/header/last_modified.rs diff --git a/src/types/header/mod.rs b/src/http/header/mod.rs similarity index 100% rename from src/types/header/mod.rs rename to src/http/header/mod.rs diff --git a/src/types/header/range.rs b/src/http/header/range.rs similarity index 100% rename from src/types/header/range.rs rename to src/http/header/range.rs diff --git a/src/types/header/utils.rs b/src/http/header/utils.rs similarity index 100% rename from src/types/header/utils.rs rename to src/http/header/utils.rs diff --git a/src/http/mod.rs b/src/http/mod.rs new file mode 100644 index 000000000..fa28a5fa9 --- /dev/null +++ b/src/http/mod.rs @@ -0,0 +1,2 @@ +pub mod header; +pub use actix_http::http::*; diff --git a/src/lib.rs b/src/lib.rs index 9c698aed1..9150ed416 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -84,6 +84,7 @@ pub mod error; mod extract; pub mod guard; mod handler; +pub mod http; mod info; pub mod middleware; mod request; @@ -117,11 +118,6 @@ pub use crate::server::HttpServer; // TODO: is exposing the error directly really needed pub use crate::types::{Either, EitherExtractError}; -pub mod http { - pub use crate::types::header; - pub use actix_http::http::*; -} - pub mod dev { //! The `actix-web` prelude for library developers //! diff --git a/src/types/mod.rs b/src/types/mod.rs index f472fed74..a062c351e 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -3,7 +3,6 @@ // TODO: review visibility mod either; pub(crate) mod form; -pub mod header; pub(crate) mod json; mod path; pub(crate) mod payload;