all examples in ch10 finished!

Author: cfsamson

ch10/e-coroutines-pin/src/future.rs

@@ -30,8 +30,8 @@ pub fn join_all<F: Future>(futures: Vec<F>) -> JoinAll<F> {
 
     impl<F: Future> Future for JoinAll<F> {
         type Output = String;
-        fn poll(self: Pin<&mut Self>, waker: &Waker) -> PollState<Self::Output> {
-            let Self { futures, finished_count} = self.get_mut();
+        fn poll(mut self: Pin<&mut Self>, waker: &Waker) -> PollState<Self::Output> {
+            let Self { futures, finished_count } = &mut *self;
             for (finished, fut) in futures.iter_mut() {
                 if *finished {
                     continue;
@@ -40,14 +40,14 @@ pub fn join_all<F: Future>(futures: Vec<F>) -> JoinAll<F> {
                 match fut.as_mut().poll(waker) {
                     PollState::Ready(_) => {
                         *finished = true;
-                        *finished_count += 1;
+                       *finished_count += 1;
                     }
 
                     PollState::NotReady => continue,
                 }
             }
 
-            if *finished_count == futures.len() {
+            if self.finished_count == self.futures.len() {
                 PollState::Ready(String::new())
             } else {
                 PollState::NotReady

ch10/e-coroutines-pin/src/http.rs

@@ -54,37 +54,38 @@ impl HttpGetFuture {
 impl Future for HttpGetFuture {
     type Output = String;
 
-    fn poll(self: Pin<&mut Self>, waker: &Waker) -> PollState<Self::Output> {
+    fn poll(mut self: Pin<&mut Self>, waker: &Waker) -> PollState<Self::Output> {
         // If this is first time polled, start the operation
         // see: https://users.rust-lang.org/t/is-it-bad-behaviour-for-a-future-or-stream-to-do-something-before-being-polled/61353
         // Avoid dns lookup this time
-        let this = self.get_mut();
+        //let this = self.get_mut();
 
-        if this.stream.is_none() {
+        let id = self.id;
+        if self.stream.is_none() {
             println!("FIRST POLL - START OPERATION");
-            this.write_request();
+            self.write_request();
             // CHANGED
-            let stream = this.stream.as_mut().unwrap();
-            runtime::reactor().register(stream, Interest::READABLE, this.id);
-            runtime::reactor().set_waker(waker, this.id);
+            let stream = (&mut self).stream.as_mut().unwrap();
+            runtime::reactor().register(stream, Interest::READABLE, id);
+            runtime::reactor().set_waker(waker, self.id);
             // ============
         }
 
         let mut buff = vec![0u8; 147];
         loop {
-            match this.stream.as_mut().unwrap().read(&mut buff) {
+            match self.stream.as_mut().unwrap().read(&mut buff) {
                 Ok(0) => {
-                    let s = String::from_utf8_lossy(&this.buffer).to_string();
-                    runtime::reactor().deregister(this.stream.as_mut().unwrap(), this.id);
+                    let s = String::from_utf8_lossy(&self.buffer).to_string();
+                    runtime::reactor().deregister(self.stream.as_mut().unwrap(), id);
                     break PollState::Ready(s.to_string());
                 }
                 Ok(n) => {
-                    this.buffer.extend(&buff[0..n]);
+                    self.buffer.extend(&buff[0..n]);
                     continue;
                 }
                 Err(e) if e.kind() == ErrorKind::WouldBlock => {
                     // always store the last given Waker
-                    runtime::reactor().set_waker(waker, this.id);
+                    runtime::reactor().set_waker(waker, self.id);
                     break PollState::NotReady;
                 }