Skip to content

Commit 00c6808

Browse files
committed
Merge pull request #198 from Ogeon/master
Rust update: Remove proc and implementation of AnyRefExt for static NetworkStream
2 parents d19cfed + 02ecad3 commit 00c6808

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/net.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl UncheckedBoxAnyDowncast for Box<NetworkStream + Send> {
114114
}
115115
}
116116

117-
impl<'a> AnyRefExt<'a> for &'a (NetworkStream + 'a) {
117+
impl<'a> AnyRefExt<'a> for &'a (NetworkStream + 'static) {
118118
#[inline]
119119
fn is<T: 'static>(self) -> bool {
120120
self.get_type_id() == TypeId::of::<T>()

src/server/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
6868
let acceptor = try!(listener.listen());
6969

7070
let mut captured = acceptor.clone();
71-
TaskBuilder::new().named("hyper acceptor").spawn(proc() {
71+
TaskBuilder::new().named("hyper acceptor").spawn(move || {
7272
let handler = Arc::new(handler);
7373
debug!("threads = {}", threads);
7474
let pool = TaskPool::new(threads);
@@ -77,7 +77,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
7777
Ok(mut stream) => {
7878
debug!("Incoming stream");
7979
let handler = handler.clone();
80-
pool.execute(proc() {
80+
pool.execute(move || {
8181
let addr = match stream.peer_name() {
8282
Ok(addr) => addr,
8383
Err(e) => {

0 commit comments

Comments
 (0)