forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #45 from seanmonstar/rustup

Browse Source 
update deprecated syntax
This commit is contained in:
Sean McArthur
2014-09-17 19:24:55 -07:00
parent d603895d7b da9de1659e
commit b9ea1fd9b8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/mod.rs
View File

@@ -57,7 +57,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
L: NetworkListener<S, A>, { L: NetworkListener<S, A>, {
let mut acceptors = Vec::new(); let mut acceptors = Vec::new();
let mut sockets = Vec::new(); let mut sockets = Vec::new();
for (ip, port) in self.pairs.move_iter() { for (ip, port) in self.pairs.into_iter() {
let mut listener: L = try_io!(NetworkListener::<S, A>::bind(ip.to_string().as_slice(), port)); let mut listener: L = try_io!(NetworkListener::<S, A>::bind(ip.to_string().as_slice(), port));
sockets.push(try_io!(listener.socket_name())); sockets.push(try_io!(listener.socket_name()));
@@ -67,7 +67,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
} }
let connections = acceptors.clone() let connections = acceptors.clone()
.move_iter() .into_iter()
.map(|acceptor| acceptor.move_incoming()) .map(|acceptor| acceptor.move_incoming())
.intertwine(); .intertwine();
@@ -136,7 +136,7 @@ impl<A: NetworkAcceptor<S>, S: NetworkStream> Listening<A> {
/// and does not close the rest of the acceptors. /// and does not close the rest of the acceptors.
pub fn close(&mut self) -> HttpResult<()> { pub fn close(&mut self) -> HttpResult<()> {
debug!("closing server"); debug!("closing server");
for acceptor in self.acceptors.mut_iter() { for acceptor in self.acceptors.iter_mut() {
try_io!(acceptor.close()); try_io!(acceptor.close());
} }
Ok(()) Ok(())