rename Application

examples/basics/src/main.rs

@@ -9,7 +9,7 @@ use futures::Stream;
 
 use std::{io, env};
 use actix_web::{error, fs, pred,
-                Application, HttpRequest, HttpResponse, HttpServer, Result, Error};
+                App, HttpRequest, HttpResponse, HttpServer, Result, Error};
 use actix_web::http::{Method, StatusCode};
 use actix_web::middleware::{self, RequestSession};
 use futures::future::{FutureResult, result};
@@ -100,7 +100,7 @@ fn main() {
     let sys = actix::System::new("basic-example");
 
     let addr = HttpServer::new(
-        || Application::new()
+        || App::new()
             // enable logger
             .middleware(middleware::Logger::default())
             // cookie session middleware

examples/diesel/src/main.rs

@@ -18,7 +18,7 @@ extern crate env_logger;
 
 use actix::prelude::*;
 use actix_web::{http, middleware,
-                Application, HttpServer, HttpRequest, HttpResponse, Error, AsyncResponder};
+                App, HttpServer, HttpRequest, HttpResponse, Error, AsyncResponder};
 
 use diesel::prelude::*;
 use futures::future::Future;
@@ -63,7 +63,7 @@ fn main() {
 
     // Start http server
     let _addr = HttpServer::new(move || {
-        Application::with_state(State{db: addr.clone()})
+        App::with_state(State{db: addr.clone()})
             // enable logger
             .middleware(middleware::Logger::default())
             .resource("/{name}", |r| r.method(http::Method::GET).a(index))})

examples/hello-world/src/main.rs

@@ -2,7 +2,7 @@ extern crate actix;
 extern crate actix_web;
 extern crate env_logger;
 
-use actix_web::{Application, HttpRequest, server, middleware};
+use actix_web::{App, HttpRequest, server, middleware};
 
 
 fn index(_req: HttpRequest) -> &'static str {
@@ -15,7 +15,7 @@ fn main() {
     let sys = actix::System::new("ws-example");
 
     let _addr = server::new(
-        || Application::new()
+        || App::new()
             // enable logger
             .middleware(middleware::Logger::default())
             .resource("/index.html", |r| r.f(|_| "Hello world!"))

examples/http-proxy/src/main.rs

@@ -5,7 +5,7 @@ extern crate env_logger;
 
 use futures::{Future, Stream};
 use actix_web::{client, server, middleware,
-                Application, AsyncResponder, Body,
+                App, AsyncResponder, Body,
                 HttpRequest, HttpResponse, HttpMessage, Error};
 
 /// Stream client request response and then send body to a server response
@@ -45,7 +45,7 @@ fn main() {
     let sys = actix::System::new("http-proxy");
 
     let _addr = server::new(
-        || Application::new()
+        || App::new()
             .middleware(middleware::Logger::default())
             .resource("/streaming", |r| r.f(streaming))
             .resource("/", |r| r.f(index)))

examples/json/src/main.rs

@@ -7,9 +7,9 @@ extern crate serde_json;
 #[macro_use] extern crate serde_derive;
 #[macro_use] extern crate json;
 
-use actix_web::{middleware, http, error, server,
-                Application, AsyncResponder,
-                HttpRequest, HttpResponse, HttpMessage, Error, Json};
+use actix_web::{
+    middleware, http, error, server,
+    App, AsyncResponder, HttpRequest, HttpResponse, HttpMessage, Error, Json};
 
 use bytes::BytesMut;
 use futures::{Future, Stream};
@@ -90,7 +90,7 @@ fn main() {
     let sys = actix::System::new("json-example");
 
     let _ = server::new(|| {
-        Application::new()
+        App::new()
             // enable logger
             .middleware(middleware::Logger::default())
             .resource("/extractor/{name}/{number}/",

examples/juniper/src/main.rs

@@ -13,9 +13,9 @@ extern crate actix_web;
 extern crate env_logger;
 
 use actix::prelude::*;
-use actix_web::{middleware, http, server,
-                Application, AsyncResponder,
-                HttpRequest, HttpResponse, HttpMessage, Error};
+use actix_web::{
+    middleware, http, server,
+    App, AsyncResponder, HttpRequest, HttpResponse, HttpMessage, Error};
 use juniper::http::graphiql::graphiql_source;
 use juniper::http::GraphQLRequest;
 
@@ -99,7 +99,7 @@ fn main() {
 
     // Start http server
     let _ = server::new(move || {
-        Application::with_state(State{executor: addr.clone()})
+        App::with_state(State{executor: addr.clone()})
             // enable logger
             .middleware(middleware::Logger::default())
             .resource("/graphql", |r| r.method(http::Method::POST).h(graphql))

examples/multipart/src/main.rs

@@ -7,7 +7,7 @@ extern crate futures;
 use actix::*;
 use actix_web::{
     http, middleware, multipart, server,
-    Application, AsyncResponder, HttpRequest, HttpResponse, HttpMessage, Error};
+    App, AsyncResponder, HttpRequest, HttpResponse, HttpMessage, Error};
 
 use futures::{Future, Stream};
 use futures::future::{result, Either};
@@ -50,7 +50,7 @@ fn main() {
     let sys = actix::System::new("multipart-example");
 
     let _ = server::new(
-        || Application::new()
+        || App::new()
             .middleware(middleware::Logger::default()) // <- logger
             .resource("/multipart", |r| r.method(http::Method::POST).a(index)))
         .bind("127.0.0.1:8080").unwrap()

examples/protobuf/src/main.rs

@@ -12,7 +12,7 @@ extern crate prost_derive;
 use futures::Future;
 use actix_web::{
     http, middleware, server,
-    Application, AsyncResponder, HttpRequest, HttpResponse, Error};
+    App, AsyncResponder, HttpRequest, HttpResponse, Error};
 
 mod protobuf;
 use protobuf::ProtoBufResponseBuilder;
@@ -45,7 +45,7 @@ fn main() {
     let sys = actix::System::new("protobuf-example");
 
     let _ = server::new(|| {
-        Application::new()
+        App::new()
             .middleware(middleware::Logger::default())
             .resource("/", |r| r.method(http::Method::POST).f(index))})
         .bind("127.0.0.1:8080").unwrap()

examples/r2d2/src/main.rs

@@ -12,8 +12,7 @@ extern crate rusqlite;
 
 use actix::prelude::*;
 use actix_web::{
-    middleware, http, server,
-    Application, AsyncResponder, HttpRequest, HttpResponse, Error};
+    middleware, http, server, App, AsyncResponder, HttpRequest, HttpResponse, Error};
 use futures::future::Future;
 use r2d2_sqlite::SqliteConnectionManager;
 
@@ -55,7 +54,7 @@ fn main() {
 
     // Start http server
     let _ = server::new(move || {
-        Application::with_state(State{db: addr.clone()})
+        App::with_state(State{db: addr.clone()})
             // enable logger
             .middleware(middleware::Logger::default())
             .resource("/{name}", |r| r.method(http::Method::GET).a(index))})

examples/state/src/main.rs

@@ -11,7 +11,7 @@ use std::cell::Cell;
 
 use actix::prelude::*;
 use actix_web::{
-    http, server, ws, middleware, Application, HttpRequest, HttpResponse};
+    http, server, ws, middleware, App, HttpRequest, HttpResponse};
 
 /// Application state
 struct AppState {
@@ -59,7 +59,7 @@ fn main() {
     let sys = actix::System::new("ws-example");
 
     let _ = server::new(
-        || Application::with_state(AppState{counter: Cell::new(0)})
+        || App::with_state(AppState{counter: Cell::new(0)})
             // enable logger
             .middleware(middleware::Logger::default())
             // websocket route

examples/template_tera/src/main.rs

@@ -5,9 +5,7 @@ extern crate env_logger;
 extern crate tera;
 
 use actix_web::{
-    http, error, middleware, server,
-    Application, HttpRequest, HttpResponse, Error,
-};
+    http, error, middleware, server, App, HttpRequest, HttpResponse, Error};
 
 
 struct State {
@@ -38,7 +36,7 @@ fn main() {
     let _ = server::new(|| {
         let tera = compile_templates!(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*"));
 
-        Application::with_state(State{template: tera})
+        App::with_state(State{template: tera})
             // enable logger
             .middleware(middleware::Logger::default())
             .resource("/", |r| r.method(http::Method::GET).f(index))})

examples/tls/src/main.rs

@@ -6,8 +6,7 @@ extern crate openssl;
 
 use openssl::ssl::{SslMethod, SslAcceptor, SslFiletype};
 use actix_web::{
-    http, middleware, server,
-    Application, HttpRequest, HttpResponse, Error};
+    http, middleware, server, App, HttpRequest, HttpResponse, Error};
 
 
 /// simple handle
@@ -31,7 +30,7 @@ fn main() {
     builder.set_certificate_chain_file("cert.pem").unwrap();
 
     let _ = server::new(
-        || Application::new()
+        || App::new()
             // enable logger
             .middleware(middleware::Logger::default())
             // register simple handler, handle all methods

examples/unix-socket/src/main.rs

@@ -14,12 +14,13 @@ fn index(_req: HttpRequest) -> &'static str {
 
 fn main() {
     ::std::env::set_var("RUST_LOG", "actix_web=info");
-    let _ = env_logger::init();
+    env_logger::init();
     let sys = actix::System::new("unix-socket");
 
-    let listener = UnixListener::bind("/tmp/actix-uds.socket", Arbiter::handle()).expect("bind failed");
-    let _addr = HttpServer::new(
-        || Application::new()
+    let listener = UnixListener::bind(
+        "/tmp/actix-uds.socket", Arbiter::handle()).expect("bind failed");
+    HttpServer::new(
+        || App::new()
             // enable logger
             .middleware(middleware::Logger::default())
             .resource("/index.html", |r| r.f(|_| "Hello world!"))

examples/web-cors/backend/src/main.rs

@@ -7,7 +7,7 @@ extern crate actix_web;
 extern crate env_logger;
 
 use std::env;
-use actix_web::{http, middleware, server, Application};
+use actix_web::{http, middleware, server, App};
 
 mod user;
 use user::info;
@@ -20,7 +20,7 @@ fn main() {
     let sys = actix::System::new("Actix-web-CORS");
 
     server::new(
-        || Application::new()
+        || App::new()
             .middleware(middleware::Logger::default())
             .resource("/user/info", |r| {
                 middleware::cors::Cors::build()

examples/websocket-chat/src/main.rs

@@ -17,9 +17,7 @@ extern crate actix_web;
 use std::time::Instant;
 
 use actix::*;
-use actix_web::{
-    http, fs, ws,
-    Application, HttpRequest, HttpResponse, HttpServer, Error};
+use actix_web::{http, fs, ws, App, HttpRequest, HttpResponse, HttpServer, Error};
 
 mod codec;
 mod server;
@@ -190,7 +188,7 @@ fn main() {
             // Websocket sessions state
             let state = WsChatSessionState { addr: server.clone() };
 
-            Application::with_state(state)
+            App::with_state(state)
                 // redirect to websocket.html
                 .resource("/", |r| r.method(http::Method::GET).f(|_| {
                     HttpResponse::Found()

examples/websocket/src/main.rs

@@ -10,9 +10,7 @@ extern crate env_logger;
 
 use actix::prelude::*;
 use actix_web::{
-    http, middleware, server, fs, ws,
-    Application, HttpRequest, HttpResponse, Error,
-};
+    http, middleware, server, fs, ws, App, HttpRequest, HttpResponse, Error};
 
 /// do websocket handshake and start `MyWebSocket` actor
 fn ws_index(r: HttpRequest) -> Result<HttpResponse, Error> {
@@ -51,7 +49,7 @@ fn main() {
     let sys = actix::System::new("ws-example");
 
     server::new(
-        || Application::new()
+        || App::new()
             // enable logger
             .middleware(middleware::Logger::default())
             // websocket route