Merge pull request #198 from Ogeon/master

Rust update: Remove proc and implementation of AnyRefExt for static NetworkStream
This commit is contained in:
Sean McArthur
2014-12-15 16:24:15 -08:00
2 changed files with 3 additions and 3 deletions

View File

@@ -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>()

View File

@@ -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) => {