From 9896bcc517c09e197f461ab8c9a09931c7dfb8db Mon Sep 17 00:00:00 2001
From: Erik Hedvall <erikwhedvall@gmail.com>
Date: Tue, 16 Dec 2014 00:02:35 +0100
Subject: [PATCH 1/2] proc() -> move ||

---
 src/server/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/mod.rs b/src/server/mod.rs
index c43c446070..0ce996bb66 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -68,7 +68,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
         let acceptor = try!(listener.listen());
 
         let mut captured = acceptor.clone();
-        TaskBuilder::new().named("hyper acceptor").spawn(proc() {
+        TaskBuilder::new().named("hyper acceptor").spawn(move || {
             let handler = Arc::new(handler);
             debug!("threads = {}", threads);
             let pool = TaskPool::new(threads);
@@ -77,7 +77,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
                     Ok(mut stream) => {
                         debug!("Incoming stream");
                         let handler = handler.clone();
-                        pool.execute(proc() {
+                        pool.execute(move || {
                             let addr = match stream.peer_name() {
                                 Ok(addr) => addr,
                                 Err(e) => {

From 02ecad33cdc9948cd40deb9bba9b4acbd3a3e4e5 Mon Sep 17 00:00:00 2001
From: Erik Hedvall <erikwhedvall@gmail.com>
Date: Tue, 16 Dec 2014 00:07:07 +0100
Subject: [PATCH 2/2] Change implementation of AnyRefExt for references to
 NetworkStream to require 'static lifetime

---
 src/net.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.rs b/src/net.rs
index 7e9e2a9107..c5fabf0c21 100644
--- a/src/net.rs
+++ b/src/net.rs
@@ -114,7 +114,7 @@ impl UncheckedBoxAnyDowncast for Box<NetworkStream + Send> {
     }
 }
 
-impl<'a> AnyRefExt<'a> for &'a (NetworkStream + 'a) {
+impl<'a> AnyRefExt<'a> for &'a (NetworkStream + 'static) {
     #[inline]
     fn is<T: 'static>(self) -> bool {
         self.get_type_id() == TypeId::of::<T>()