rename module

src/application.rs

@@ -7,7 +7,7 @@ use resource::Resource;
 use httprequest::HttpRequest;
 use channel::{HttpHandler, IntoHttpHandler, HttpHandlerTask};
 use pipeline::Pipeline;
-use middlewares::Middleware;
+use middleware::Middleware;
 use server::ServerSettings;
 
 /// Application

src/lib.rs

@@ -115,7 +115,7 @@ pub mod ws;
 pub mod error;
 pub mod httpcodes;
 pub mod multipart;
-pub mod middlewares;
+pub mod middleware;
 pub mod pred;
 pub mod test;
 pub mod payload;

src/middleware/defaultheaders.rs

@@ -4,7 +4,7 @@ use http::header::{HeaderName, HeaderValue, CONTENT_TYPE};
 
 use httprequest::HttpRequest;
 use httpresponse::HttpResponse;
-use middlewares::{Response, Middleware};
+use middleware::{Response, Middleware};
 
 /// `Middleware` for setting default response headers.
 ///
@@ -17,7 +17,7 @@ use middlewares::{Response, Middleware};
 /// fn main() {
 ///     let app = Application::new()
 ///         .middleware(
-///             middlewares::DefaultHeaders::build()
+///             middleware::DefaultHeaders::build()
 ///                 .header("X-Version", "0.2")
 ///                 .finish())
 ///         .resource("/test", |r| {

src/middleware/logger.rs

@@ -9,13 +9,13 @@ use regex::Regex;
 
 use httprequest::HttpRequest;
 use httpresponse::HttpResponse;
-use middlewares::{Middleware, Started, Finished};
+use middleware::{Middleware, Started, Finished};
 
 /// `Middleware` for logging request and response info to the terminal.
 ///
 /// ## Usage
 ///
-/// Create `Logger` middlewares with the specified `format`.
+/// Create `Logger` middleware with the specified `format`.
 /// Default `Logger` could be created with `default` method, it uses the default format:
 ///
 /// ```ignore
@@ -24,7 +24,7 @@ use middlewares::{Middleware, Started, Finished};
 /// ```rust
 /// # extern crate actix_web;
 /// use actix_web::Application;
-/// use actix_web::middlewares::Logger;
+/// use actix_web::middleware::Logger;
 ///
 /// fn main() {
 ///     let app = Application::new()

src/middleware/session.rs

@@ -17,13 +17,13 @@ use futures::future::{FutureResult, ok as FutOk, err as FutErr};
 use error::{Result, Error, ResponseError};
 use httprequest::HttpRequest;
 use httpresponse::HttpResponse;
-use middlewares::{Middleware, Started, Response};
+use middleware::{Middleware, Started, Response};
 
 /// The helper trait to obtain your session data from a request.
 ///
 /// ```rust
 /// use actix_web::*;
-/// use actix_web::middlewares::RequestSession;
+/// use actix_web::middleware::RequestSession;
 ///
 /// fn index(mut req: HttpRequest) -> Result<&'static str> {
 ///     // access session data
@@ -62,7 +62,7 @@ impl RequestSession for HttpRequest {
 ///
 /// ```rust
 /// use actix_web::*;
-/// use actix_web::middlewares::RequestSession;
+/// use actix_web::middleware::RequestSession;
 ///
 /// fn index(mut req: HttpRequest) -> Result<&'static str> {
 ///     // access session data
@@ -118,12 +118,12 @@ unsafe impl Sync for SessionImplBox {}
 /// ```rust
 /// # extern crate actix;
 /// # extern crate actix_web;
-/// # use actix_web::middlewares::{SessionStorage, CookieSessionBackend};
+/// # use actix_web::middleware::{SessionStorage, CookieSessionBackend};
 /// use actix_web::*;
 ///
 /// fn main() {
 ///    let app = Application::new().middleware(
-///        SessionStorage::new(                      // <- create session middlewares
+///        SessionStorage::new(                      // <- create session middleware
 ///            CookieSessionBackend::build(&[0; 32]) // <- create cookie session backend
 ///               .secure(false)
 ///               .finish())
@@ -358,7 +358,7 @@ impl CookieSessionBackend {
     /// # Example
     ///
     /// ```
-    /// use actix_web::middlewares::CookieSessionBackend;
+    /// use actix_web::middleware::CookieSessionBackend;
     ///
     /// let backend = CookieSessionBackend::build(&[0; 32]).finish();
     /// ```
@@ -396,7 +396,7 @@ impl<S> SessionBackend<S> for CookieSessionBackend {
 /// ```rust
 /// # extern crate actix_web;
 ///
-/// use actix_web::middlewares::CookieSessionBackend;
+/// use actix_web::middleware::CookieSessionBackend;
 ///
 /// # fn main() {
 /// let backend: CookieSessionBackend = CookieSessionBackend::build(&[0; 32])

src/pipeline.rs

@@ -13,7 +13,7 @@ use handler::{Reply, ReplyItem};
 use h1writer::{Writer, WriterState};
 use httprequest::HttpRequest;
 use httpresponse::HttpResponse;
-use middlewares::{Middleware, Finished, Started, Response};
+use middleware::{Middleware, Finished, Started, Response};
 
 type Handler<S> = FnMut(HttpRequest<S>) -> Reply;
 pub(crate) type PipelineHandler<'a, S> = &'a mut FnMut(HttpRequest<S>) -> Reply;

src/test/mod.rs

@@ -18,7 +18,7 @@ use error::Error;
 use server::HttpServer;
 use handler::{Handler, Responder, ReplyItem};
 use channel::{HttpHandler, IntoHttpHandler};
-use middlewares::Middleware;
+use middleware::Middleware;
 use application::{Application, HttpApplication};
 use param::Params;
 use router::Router;