http crate removed, cargo fmt

examples/echo.rs

@@ -4,39 +4,37 @@ extern crate env_logger;
 
 extern crate actix_http;
 extern crate actix_net;
+extern crate bytes;
 extern crate futures;
 extern crate http;
-extern crate bytes;
 
-use actix_http::{h1, Response, Request};
+use actix_http::HttpMessage;
-use bytes::Bytes;
+use actix_http::{h1, Request, Response};
 use actix_net::server::Server;
 use actix_net::service::NewServiceExt;
+use bytes::Bytes;
 use futures::Future;
-use http::header::{HeaderValue};
+use http::header::HeaderValue;
-use actix_http::HttpMessage;
 use std::env;
 
 fn main() {
     env::set_var("RUST_LOG", "echo=info");
     env_logger::init();
 
-    Server::new().bind("echo", "127.0.0.1:8080", || {
+    Server::new()
+        .bind("echo", "127.0.0.1:8080", || {
             h1::H1Service::build()
                 .client_timeout(1000)
                 .client_disconnect(1000)
                 .server_hostname("localhost")
                 .finish(|_req: Request| {
-                _req.body()
+                    _req.body().limit(512).and_then(|bytes: Bytes| {
-                    .limit(512)
-                    .and_then(|bytes: Bytes| {
                         info!("request body: {:?}", bytes);
                         let mut res = Response::Ok();
                         res.header("x-head", HeaderValue::from_static("dummy value!"));
                         Ok(res.body(bytes))
                     })
-            })
+                }).map(|_| ())
-            .map(|_| ())
+        }).unwrap()
-    }).unwrap().run();
+        .run();
 }
-

examples/echo2.rs

@@ -4,24 +4,20 @@ extern crate env_logger;
 
 extern crate actix_http;
 extern crate actix_net;
-extern crate futures;
-extern crate http;
 extern crate bytes;
+extern crate futures;
 
-use actix_http::{h1, Response, Request, Error};
+use actix_http::http::HeaderValue;
-use bytes::Bytes;
+use actix_http::HttpMessage;
+use actix_http::{h1, Error, Request, Response};
 use actix_net::server::Server;
 use actix_net::service::NewServiceExt;
+use bytes::Bytes;
 use futures::Future;
-use http::header::{HeaderValue};
-use actix_http::HttpMessage;
 use std::env;
 
-fn handle_request(_req: Request) -> impl Future<Item = Response, Error = Error>{
+fn handle_request(_req: Request) -> impl Future<Item = Response, Error = Error> {
-    _req.body()
+    _req.body().limit(512).from_err().and_then(|bytes: Bytes| {
-        .limit(512)
-        .from_err()
-        .and_then(|bytes: Bytes| {
         info!("request body: {:?}", bytes);
         let mut res = Response::Ok();
         res.header("x-head", HeaderValue::from_static("dummy value!"));
@@ -33,15 +29,14 @@ fn main() {
     env::set_var("RUST_LOG", "echo=info");
     env_logger::init();
 
-    Server::new().bind("echo", "127.0.0.1:8080", || {
+    Server::new()
+        .bind("echo", "127.0.0.1:8080", || {
             h1::H1Service::build()
                 .client_timeout(1000)
                 .client_disconnect(1000)
                 .server_hostname("localhost")
-            .finish(|_req: Request| {
+                .finish(|_req: Request| handle_request(_req))
-                handle_request(_req)
-            })
                 .map(|_| ())
-    }).unwrap().run();
+        }).unwrap()
+        .run();
 }
-

examples/framed_hello.rs

@@ -1,18 +1,18 @@
-extern crate log;
 extern crate env_logger;
+extern crate log;
 
 extern crate actix_http;
 extern crate actix_net;
+extern crate bytes;
 extern crate futures;
 extern crate http;
-extern crate bytes;
 
-use actix_http::{h1, ServiceConfig, SendResponse, Response};
+use actix_http::{h1, Response, SendResponse, ServiceConfig};
-use actix_net::framed::IntoFramed;
 use actix_net::codec::Framed;
-use actix_net::stream::TakeItem;
+use actix_net::framed::IntoFramed;
 use actix_net::server::Server;
 use actix_net::service::NewServiceExt;
+use actix_net::stream::TakeItem;
 use futures::Future;
 use std::env;
 
@@ -20,7 +20,8 @@ fn main() {
     env::set_var("RUST_LOG", "framed_hello=info");
     env_logger::init();
 
-    Server::new().bind("framed_hello", "127.0.0.1:8080", || {
+    Server::new()
+        .bind("framed_hello", "127.0.0.1:8080", || {
             IntoFramed::new(|| h1::Codec::new(ServiceConfig::default()))
                 .and_then(TakeItem::new().map_err(|_| ()))
                 .and_then(|(_req, _framed): (_, Framed<_, _>)| {
@@ -28,6 +29,6 @@ fn main() {
                         .map_err(|_| ())
                         .map(|_| ())
                 })
-    }).unwrap().run();
+        }).unwrap()
+        .run();
 }
-

examples/hello-world.rs

@@ -11,14 +11,15 @@ use actix_http::{h1, Response};
 use actix_net::server::Server;
 use actix_net::service::NewServiceExt;
 use futures::future;
-use http::header::{HeaderValue};
+use http::header::HeaderValue;
 use std::env;
 
 fn main() {
     env::set_var("RUST_LOG", "hello_world=info");
     env_logger::init();
 
-    Server::new().bind("hello-world", "127.0.0.1:8080", || {
+    Server::new()
+        .bind("hello-world", "127.0.0.1:8080", || {
             h1::H1Service::build()
                 .client_timeout(1000)
                 .client_disconnect(1000)
@@ -28,8 +29,7 @@ fn main() {
                     let mut res = Response::Ok();
                     res.header("x-head", HeaderValue::from_static("dummy value!"));
                     future::ok::<_, ()>(res.body("Hello world!"))
-            })
+                }).map(|_| ())
-            .map(|_| ())
+        }).unwrap()
-    }).unwrap().run();
+        .run();
 }
-