Fix up - WIP

Fuyang Liu · Fuyang Liu · commit a3926866bb5a · 2019-07-10T23:27:28.000+02:00
diff --git a/examples/echo.rs b/examples/echo.rs
@@ -3,11 +3,9 @@
 
 extern crate hyper;
 
-use futures_util::stream::StreamExt; // TODO: is this correct or?
-
 use hyper::{Body, Method, Request, Response, Server, StatusCode};
 use hyper::service::{make_service_fn, service_fn};
-use hyper::body::Chunk;
+use futures_util::TryStreamExt;
 
 /// This is our service handler. It receives a Request, routes on its
 /// path, and returns a Future of a Response.
@@ -27,16 +25,14 @@ async fn echo(req: Request<Body>) -> Result<Response<Body>, hyper::Error> {
 
         // Convert to uppercase before sending back to client.
         (&Method::POST, "/echo/uppercase") => {
-            let mapping = req.into_body().map(|chunk| {
-                let chunk= chunk.unwrap();
-                let x = chunk
+            let mapping = req.into_body().map_ok(|chunk| {
+                chunk
                     .iter()
                     .map(|byte| byte.to_ascii_uppercase())
-                    .collect::<Vec<_>>();
-                x
-            }).collect::<Vec<_>>().await;
+                    .collect::<Vec<u8>>()
+            });
 
-            *response.body_mut() = Body::from(mapping);
+            *response.body_mut() = Body::wrap_stream(mapping);
         }
 
         // Reverse the entire body before sending back to the client.
@@ -45,15 +41,15 @@ async fn echo(req: Request<Body>) -> Result<Response<Body>, hyper::Error> {
         // the chunks as they arrive. So, this returns a different
         // future, waiting on concatenating the full body, so that
         // it can be reversed. Only then can we return a `Response`.
-//        (&Method::POST, "/echo/reversed") => {
-//            let reversed = req.into_body().concat2().map(move |chunk| {
-//                let body = chunk.iter().rev().cloned().collect::<Vec<u8>>();
-//                *response.body_mut() = Body::from(body);
-//                response
-//            });
-//
-//            return Ok(reversed);
-//        }
+        (&Method::POST, "/echo/reversed") => {
+            let reversed = req.into_body().concat2().map(move |chunk| {
+                let body = chunk.iter().rev().cloned().collect::<Vec<u8>>();
+                *response.body_mut() = Body::from(body);
+                response
+            });
+
+            return Ok(reversed);
+        }
 
         // The 404 Not Found route...
         _ => {
