rename .middleware to .wrap

src/middleware/cors.rs

@@ -1,8 +1,8 @@
 //! Cross-origin resource sharing (CORS) for Actix applications
 //!
 //! CORS middleware could be used with application and with resource.
-//! Cors middleware could be used as parameter for `App::middleware()`,
-//! `Resource::middleware()` or `Scope::middleware()` methods.
+//! Cors middleware could be used as parameter for `App::wrap()`,
+//! `Resource::wrap()` or `Scope::wrap()` methods.
 //!
 //! # Example
 //!
@@ -16,7 +16,7 @@
 //!
 //! fn main() -> std::io::Result<()> {
 //!     HttpServer::new(|| App::new()
-//!         .middleware(
+//!         .wrap(
 //!             Cors::new() // <- Construct CORS middleware builder
 //!               .allowed_origin("https://www.rust-lang.org/")
 //!               .allowed_methods(vec!["GET", "POST"])

src/middleware/defaultheaders.rs

@@ -18,7 +18,7 @@ use crate::service::{ServiceRequest, ServiceResponse};
 ///
 /// fn main() {
 ///     let app = App::new()
-///         .middleware(middleware::DefaultHeaders::new().header("X-Version", "0.2"))
+///         .wrap(middleware::DefaultHeaders::new().header("X-Version", "0.2"))
 ///         .service(
 ///             web::resource("/test")
 ///                 .route(web::get().to(|| HttpResponse::Ok()))

src/middleware/errhandlers.rs

@@ -41,7 +41,7 @@ type ErrorHandler<B> = Fn(ServiceResponse<B>) -> Result<ErrorHandlerResponse<B>>
 ///
 /// fn main() {
 ///     let app = App::new()
-///         .middleware(
+///         .wrap(
 ///             ErrorHandlers::new()
 ///                 .handler(http::StatusCode::INTERNAL_SERVER_ERROR, render_500),
 ///         )

src/middleware/identity.rs

@@ -37,7 +37,7 @@
 //! }
 //!
 //! fn main() {
-//!     let app = App::new().middleware(IdentityService::new(
+//!     let app = App::new().wrap(IdentityService::new(
 //!         // <- create identity middleware
 //!         CookieIdentityPolicy::new(&[0; 32])    // <- create cookie session backend
 //!               .name("auth-cookie")
@@ -179,7 +179,7 @@ pub trait IdentityPolicy: Sized + 'static {
 /// use actix_web::middleware::identity::{CookieIdentityPolicy, IdentityService};
 ///
 /// fn main() {
-///     let app = App::new().middleware(IdentityService::new(
+///     let app = App::new().wrap(IdentityService::new(
 ///         // <- create identity middleware
 ///         CookieIdentityPolicy::new(&[0; 32])    // <- create cookie session backend
 ///               .name("auth-cookie")
@@ -381,7 +381,7 @@ impl CookieIdentityInner {
 /// use actix_web::App;
 ///
 /// fn main() {
-///     let app = App::new().middleware(IdentityService::new(
+///     let app = App::new().wrap(IdentityService::new(
 ///         // <- create identity middleware
 ///         CookieIdentityPolicy::new(&[0; 32])  // <- construct cookie policy
 ///                .domain("www.rust-lang.org")
@@ -473,7 +473,7 @@ mod tests {
     fn test_identity() {
         let mut srv = test::init_service(
             App::new()
-                .middleware(IdentityService::new(
+                .wrap(IdentityService::new(
                     CookieIdentityPolicy::new(&[0; 32])
                         .domain("www.rust-lang.org")
                         .name("actix_auth")

src/middleware/logger.rs

@@ -41,8 +41,8 @@ use crate::{HttpMessage, HttpResponse};
 ///     env_logger::init();
 ///
 ///     let app = App::new()
-///         .middleware(Logger::default())
-///         .middleware(Logger::new("%a %{User-Agent}i"));
+///         .wrap(Logger::default())
+///         .wrap(Logger::new("%a %{User-Agent}i"));
 /// }
 /// ```
 ///