Merge pull request #49 from withoutboats/incoming-by-ref

TcpListener::incoming should be by reference

examples/echo.rs

@@ -13,7 +13,7 @@ fn main() -> io::Result<()> {
     executor::block_on(async {
         let mut threadpool = ThreadPool::new()?;
 
-        let listener = TcpListener::bind(&"127.0.0.1:7878".parse().unwrap())?;
+        let mut listener = TcpListener::bind(&"127.0.0.1:7878".parse().unwrap())?;
         let mut incoming = listener.incoming();
 
         println!("Listening on 127.0.0.1:7878");

examples/shakespeare.rs

@@ -26,7 +26,7 @@ fn main() -> io::Result<()> {
     executor::block_on(async {
         let mut threadpool = ThreadPool::new()?;
 
-        let listener = TcpListener::bind(&"127.0.0.1:7878".parse().unwrap())?;
+        let mut listener = TcpListener::bind(&"127.0.0.1:7878".parse().unwrap())?;
         let mut incoming = listener.incoming();
 
         println!("Listening on 127.0.0.1:7878");

src/lib.rs

@@ -28,7 +28,7 @@
 //!
 //! async fn listen() -> Result<(), Box<dyn std::error::Error + 'static>> {
 //!     let socket_addr = "127.0.0.1:8080".parse()?;
-//!     let listener = TcpListener::bind(&socket_addr)?;
+//!     let mut listener = TcpListener::bind(&socket_addr)?;
 //!     let mut incoming = listener.incoming();
 //!
 //!     // accept connections and process them serially

src/tcp/listener.rs

@@ -38,7 +38,7 @@ use crate::reactor::PollEvented;
 ///
 /// async fn listen() -> Result<(), Box<dyn Error + 'static>> {
 ///     let socket_addr = "127.0.0.1:80".parse()?;
-///     let listener = TcpListener::bind(&socket_addr)?;
+///     let mut listener = TcpListener::bind(&socket_addr)?;
 ///     let mut incoming = listener.incoming();
 ///
 ///     // accept connections and process them serially
@@ -130,7 +130,7 @@ impl TcpListener {
     ///
     /// # async fn work () -> Result<(), Box<dyn std::error::Error + 'static>> {
     /// let socket_addr = "127.0.0.1:80".parse()?;
-    /// let listener = TcpListener::bind(&socket_addr)?;
+    /// let mut listener = TcpListener::bind(&socket_addr)?;
     /// let mut incoming = listener.incoming();
     ///
     /// // accept connections and process them serially
@@ -144,8 +144,8 @@ impl TcpListener {
     /// }
     /// # Ok(())}
     /// ```
-    pub fn incoming(self) -> Incoming {
-        Incoming::new(self)
+    pub fn incoming(&mut self) -> Incoming<'_> {
+        Incoming { inner: self }
     }
 
     /// Gets the value of the `IP_TTL` option for this socket.
@@ -242,17 +242,11 @@ mod sys {
 /// stream of sockets received from a listener.
 #[must_use = "streams do nothing unless polled"]
 #[derive(Debug)]
-pub struct Incoming {
-    inner: TcpListener,
-}
-
-impl Incoming {
-    pub(crate) fn new(listener: TcpListener) -> Incoming {
-        Incoming { inner: listener }
-    }
+pub struct Incoming<'a> {
+    inner: &'a mut TcpListener,
 }
 
-impl Stream for Incoming {
+impl<'a> Stream for Incoming<'a> {
     type Item = io::Result<TcpStream>;
 
     fn poll_next(mut self: Pin<&mut Self>, lw: &LocalWaker) -> Poll<Option<Self::Item>> {

src/tcp/mod.rs

@@ -29,7 +29,7 @@
 //!
 //! async fn listen() -> Result<(), Box<dyn std::error::Error + 'static>> {
 //!     let socket_addr = "127.0.0.1:80".parse()?;
-//!     let listener = TcpListener::bind(&socket_addr)?;
+//!     let mut listener = TcpListener::bind(&socket_addr)?;
 //!     let mut incoming = listener.incoming();
 //!
 //!     // accept connections and process them serially

tests/tcp.rs

@@ -21,7 +21,7 @@ const THE_WINTERS_TALE: &[u8] = b"
 #[test]
 fn listener_reads() {
     drop(env_logger::try_init());
-    let server = TcpListener::bind(&"127.0.0.1:0".parse().unwrap()).unwrap();
+    let mut server = TcpListener::bind(&"127.0.0.1:0".parse().unwrap()).unwrap();
     let addr = server.local_addr().unwrap();
 
     // client thread
@@ -42,7 +42,7 @@ fn listener_reads() {
 #[test]
 fn listener_writes() {
     drop(env_logger::try_init());
-    let server = TcpListener::bind(&"127.0.0.1:0".parse().unwrap()).unwrap();
+    let mut server = TcpListener::bind(&"127.0.0.1:0".parse().unwrap()).unwrap();
     let addr = server.local_addr().unwrap();
 
     // client thread
@@ -63,7 +63,7 @@ fn listener_writes() {
 #[test]
 fn both_sides_async_using_threadpool() {
     drop(env_logger::try_init());
-    let server = TcpListener::bind(&"127.0.0.1:0".parse().unwrap()).unwrap();
+    let mut server = TcpListener::bind(&"127.0.0.1:0".parse().unwrap()).unwrap();
     let addr = server.local_addr().unwrap();
 
     let mut pool = executor::ThreadPool::new().unwrap();