From f4a66b38cb9e35bfec0bbc3c97e5298fc8ad8409 Mon Sep 17 00:00:00 2001
From: Renato Zannon <renato@rrsz.com.br>
Date: Thu, 19 Feb 2015 18:40:04 -0200
Subject: [PATCH] fix(rustup): update lifetime bounds

Send no longer implies 'static; update needed lifetime bounds.
---
 src/header/common/authorization.rs |  4 ++--
 src/net.rs                         |  2 +-
 src/server/acceptor.rs             | 13 ++++++-------
 src/server/mod.rs                  |  6 +++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/header/common/authorization.rs b/src/header/common/authorization.rs
index 9999089e4f..cd9844f245 100644
--- a/src/header/common/authorization.rs
+++ b/src/header/common/authorization.rs
@@ -22,7 +22,7 @@ impl<S: Scheme> DerefMut for Authorization<S> {
     }
 }
 
-impl<S: Scheme> Header for Authorization<S> {
+impl<S: Scheme + 'static> Header for Authorization<S> {
     fn header_name() -> &'static str {
         "Authorization"
     }
@@ -43,7 +43,7 @@ impl<S: Scheme> Header for Authorization<S> {
     }
 }
 
-impl<S: Scheme> HeaderFormat for Authorization<S> {
+impl<S: Scheme + 'static> HeaderFormat for Authorization<S> {
     fn fmt_header(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         match Scheme::scheme(None::<S>) {
             Some(scheme) => try!(write!(fmt, "{} ", scheme)),
diff --git a/src/net.rs b/src/net.rs
index b11abfa327..f7ff2554f6 100644
--- a/src/net.rs
+++ b/src/net.rs
@@ -58,7 +58,7 @@ pub trait NetworkAcceptor: Clone + Send {
 }
 
 /// An iterator wrapper over a NetworkAcceptor.
-pub struct NetworkConnections<'a, N: NetworkAcceptor>(&'a mut N);
+pub struct NetworkConnections<'a, N: NetworkAcceptor + 'a>(&'a mut N);
 
 impl<'a, N: NetworkAcceptor> Iterator for NetworkConnections<'a, N> {
     type Item = IoResult<N::Stream>;
diff --git a/src/server/acceptor.rs b/src/server/acceptor.rs
index 3c0e0b5e15..a4cc5b4a99 100644
--- a/src/server/acceptor.rs
+++ b/src/server/acceptor.rs
@@ -7,7 +7,7 @@ pub struct AcceptorPool<A: NetworkAcceptor> {
     acceptor: A
 }
 
-impl<A: NetworkAcceptor> AcceptorPool<A> {
+impl<A: NetworkAcceptor + 'static> AcceptorPool<A> {
     /// Create a thread pool to manage the acceptor.
     pub fn new(acceptor: A) -> AcceptorPool<A> {
         AcceptorPool { acceptor: acceptor }
@@ -18,9 +18,8 @@ impl<A: NetworkAcceptor> AcceptorPool<A> {
     /// ## Panics
     ///
     /// Panics if threads == 0.
-    pub fn accept<F: Fn(A::Stream) + Send + Sync>(self,
-                                                  work: F,
-                                                  threads: usize) -> JoinGuard<'static, ()> {
+    pub fn accept<F>(self, work: F, threads: usize) -> JoinGuard<'static, ()>
+        where F: Fn(A::Stream) + Send + Sync + 'static {
         assert!(threads != 0, "Can't accept on 0 threads.");
 
         // Replace with &F when Send changes land.
@@ -40,8 +39,8 @@ impl<A: NetworkAcceptor> AcceptorPool<A> {
 }
 
 fn spawn_with<A, F>(supervisor: mpsc::Sender<()>, work: Arc<F>, mut acceptor: A)
-where A: NetworkAcceptor,
-      F: Fn(<A as NetworkAcceptor>::Stream) + Send + Sync {
+where A: NetworkAcceptor + 'static,
+      F: Fn(<A as NetworkAcceptor>::Stream) + Send + Sync + 'static {
     use std::old_io::EndOfFile;
 
     Thread::spawn(move || {
@@ -83,7 +82,7 @@ impl<T: Send> Sentinel<T> {
 }
 
 #[unsafe_destructor]
-impl<T: Send> Drop for Sentinel<T> {
+impl<T: Send + 'static> Drop for Sentinel<T> {
     fn drop(&mut self) {
         // If we were cancelled, get out of here.
         if !self.active { return; }
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 01fa9184bd..bbb4a4c626 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -56,7 +56,7 @@ impl Server<HttpListener> {
 
 impl<
 L: NetworkListener<Acceptor=A> + Send,
-A: NetworkAcceptor<Stream=S> + Send,
+A: NetworkAcceptor<Stream=S> + Send + 'static,
 S: NetworkStream + Clone + Send> Server<L> {
     /// Creates a new server that will handle `HttpStream`s.
     pub fn with_listener(ip: IpAddr, port: Port, listener: L) -> Server<L> {
@@ -68,7 +68,7 @@ S: NetworkStream + Clone + Send> Server<L> {
     }
 
     /// Binds to a socket, and starts handling connections using a task pool.
-    pub fn listen_threads<H: Handler>(mut self, handler: H, threads: usize) -> HttpResult<Listening<L::Acceptor>> {
+    pub fn listen_threads<H: Handler + 'static>(mut self, handler: H, threads: usize) -> HttpResult<Listening<L::Acceptor>> {
         debug!("binding to {:?}:{:?}", self.ip, self.port);
         let acceptor = try!(self.listener.listen((self.ip, self.port)));
         let socket = try!(acceptor.socket_name());
@@ -85,7 +85,7 @@ S: NetworkStream + Clone + Send> Server<L> {
     }
 
     /// Binds to a socket and starts handling connections.
-    pub fn listen<H: Handler>(self, handler: H) -> HttpResult<Listening<L::Acceptor>> {
+    pub fn listen<H: Handler + 'static>(self, handler: H) -> HttpResult<Listening<L::Acceptor>> {
         self.listen_threads(handler, os::num_cpus() * 5 / 4)
     }