From 3fbf3040cdd4b685a9270c4d9cd165a6dd667147 Mon Sep 17 00:00:00 2001
From: Jonathan Reem <jonathan.reem@gmail.com>
Date: Sun, 7 Sep 2014 09:37:53 +0200
Subject: [PATCH] Updated example for new Handler trait

This introduces a bit of complexity to the example,
mainly the use of the try_continue! macro for dealing
with errors, but I think this is an appropriate trade-off
as users of this library are likely to be framework authors
instead of end users.
---
 examples/server.rs | 53 ++++++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/examples/server.rs b/examples/server.rs
index 28483369..30e24969 100644
--- a/examples/server.rs
+++ b/examples/server.rs
@@ -1,38 +1,55 @@
+#![feature(macro_rules)]
+
 extern crate hyper;
 extern crate debug;
 
-use std::io::{IoResult};
 use std::io::util::copy;
 use std::io::net::ip::Ipv4Addr;
 
 use hyper::{Get, Post};
-use hyper::server::{Server, Handler, Request, Response};
+use hyper::server::{Server, Handler, Incoming};
 use hyper::header::ContentLength;
 
 struct Echo;
 
+macro_rules! try_continue(
+    ($e:expr) => {{
+        match $e {
+            Ok(v) => v,
+            Err(e) => { println!("Error: {}", e); continue; }
+        }
+    }}
+)
+
 impl Handler for Echo {
-    fn handle(&mut self, mut req: Request, mut res: Response) -> IoResult<()> {
-        match req.uri {
-            hyper::uri::AbsolutePath(ref path) => match (&req.method, path.as_slice()) {
-                (&Get, "/") | (&Get, "/echo") => {
-                    let out = b"Try POST /echo";
+    fn handle(self, mut incoming: Incoming) {
+        for (mut req, mut res) in incoming {
+            match req.uri {
+                hyper::uri::AbsolutePath(ref path) => match (&req.method, path.as_slice()) {
+                    (&Get, "/") | (&Get, "/echo") => {
+                        let out = b"Try POST /echo";
 
-                    res.headers.set(ContentLength(out.len()));
-                    try!(res.write(out));
-                    return res.end();
+                        res.headers.set(ContentLength(out.len()));
+                        try_continue!(res.write(out));
+                        try_continue!(res.end());
+                        continue;
+                    },
+                    (&Post, "/echo") => (), // fall through, fighting mutable borrows
+                    _ => {
+                        res.status = hyper::status::NotFound;
+                        try_continue!(res.end());
+                        continue;
+                    }
                 },
-                (&Post, "/echo") => (), // fall through, fighting mutable borrows
                 _ => {
-                    res.status = hyper::status::NotFound;
-                    return res.end();
+                    try_continue!(res.end());
+                    continue; 
                 }
-            },
-            _ => return res.end()
-        };
+            };
 
-        try!(copy(&mut req, &mut res));
-        res.end()
+            try_continue!(copy(&mut req, &mut res));
+            try_continue!(res.end());
+        }
     }
 }