OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Acceptor iterator ending early if a connection attempt fails

Browse Source
This commit is contained in:
Eric Reed 2013-09-05 16:49:38 -07:00
parent ed695d470b
commit 8f0721bcb8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libstd/rt/io/mod.rs
View File

@ -493,7 +493,7 @@ pub trait Acceptor<T> {
/// then `accept` returns `None`. /// then `accept` returns `None`.
fn accept(&mut self) -> Option<T>; fn accept(&mut self) -> Option<T>;
/// Create an iterator over incoming connections /// Create an iterator over incoming connection attempts
fn incoming<'r>(&'r mut self) -> IncomingIterator<'r, Self> { fn incoming<'r>(&'r mut self) -> IncomingIterator<'r, Self> {
IncomingIterator { inc: self } IncomingIterator { inc: self }
} }
@ -501,13 +501,18 @@ pub trait Acceptor<T> {
/// An infinite iterator over incoming connection attempts. /// An infinite iterator over incoming connection attempts.
/// Calling `next` will block the task until a connection is attempted. /// Calling `next` will block the task until a connection is attempted.
///
/// Since connection attempts can continue forever, this iterator always returns Some.
/// The Some contains another Option representing whether the connection attempt was succesful.
/// A successful connection will be wrapped in Some.
/// A failed connection is represented as a None and raises a condition.
struct IncomingIterator<'self, A> { struct IncomingIterator<'self, A> {
priv inc: &'self mut A, priv inc: &'self mut A,
} }
impl<'self, T, A: Acceptor<T>> Iterator<T> for IncomingIterator<'self, A> { impl<'self, T, A: Acceptor<T>> Iterator<Option<T>> for IncomingIterator<'self, A> {
fn next(&mut self) -> Option<T> { fn next(&mut self) -> Option<Option<T>> {
self.inc.accept() Some(self.inc.accept())
} }
} }