Ch. 17§05 initial edits on 'Composing Streams'

rust-lang · Jul 12, 2024 · bb8718f · bb8718f
1 parent 50de94b
commit bb8718f
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 753 deletions.
diff --git a/...ch17-async-await/listing-17-41/Cargo.lock → ...ch17-async-await/listing-17-32/Cargo.lock b/...ch17-async-await/listing-17-41/Cargo.lock → ...ch17-async-await/listing-17-32/Cargo.lock
diff --git a/...ch17-async-await/listing-17-41/Cargo.toml → ...ch17-async-await/listing-17-32/Cargo.toml b/...ch17-async-await/listing-17-41/Cargo.toml → ...ch17-async-await/listing-17-32/Cargo.toml
diff --git a/...h17-async-await/listing-17-42/src/main.rs → ...h17-async-await/listing-17-32/src/main.rs b/...h17-async-await/listing-17-42/src/main.rs → ...h17-async-await/listing-17-32/src/main.rs
@@ -7,18 +7,16 @@ fn main() {
         while let Some(message) = messages.next().await {
             println!("{message}");
         }
-    })
+    });
 }
 
 fn get_messages() -> impl Stream<Item = String> {
     let (tx, rx) = trpl::channel();
 
-    // ANCHOR: send
     let messages = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"];
     for message in messages {
         tx.send(format!("Message: '{message}'")).unwrap();
     }
-    // ANCHOR_END: send
 
     ReceiverStream::new(rx)
 }
diff --git a/...ch17-async-await/listing-17-42/Cargo.lock → ...ch17-async-await/listing-17-33/Cargo.lock b/...ch17-async-await/listing-17-42/Cargo.lock → ...ch17-async-await/listing-17-33/Cargo.lock
diff --git a/...ch17-async-await/listing-17-42/Cargo.toml → ...ch17-async-await/listing-17-33/Cargo.toml b/...ch17-async-await/listing-17-42/Cargo.toml → ...ch17-async-await/listing-17-33/Cargo.toml
diff --git a/...h17-async-await/listing-17-44/src/main.rs → ...h17-async-await/listing-17-33/src/main.rs b/...h17-async-await/listing-17-44/src/main.rs → ...h17-async-await/listing-17-33/src/main.rs
@@ -1,16 +1,11 @@
-// ANCHOR: pin
+// ANCHOR: timeout
 use std::{pin::pin, time::Duration};
-// --snip--
-
-// ANCHOR_END: pin
 use trpl::{ReceiverStream, Stream, StreamExt};
 
 fn main() {
     trpl::block_on(async {
-        // ANCHOR: pin
         let mut messages =
             pin!(get_messages().timeout(Duration::from_millis(200)));
-        // ANCHOR_END: pin
 
         while let Some(result) = messages.next().await {
             match result {
@@ -20,6 +15,7 @@ fn main() {
         }
     })
 }
+// ANCHOR_END: timeout
 
 fn get_messages() -> impl Stream<Item = String> {
     let (tx, rx) = trpl::channel();

diff --git a/...ch17-async-await/listing-17-43/Cargo.lock → ...ch17-async-await/listing-17-34/Cargo.lock b/...ch17-async-await/listing-17-43/Cargo.lock → ...ch17-async-await/listing-17-34/Cargo.lock
diff --git a/...ch17-async-await/listing-17-43/Cargo.toml → ...ch17-async-await/listing-17-34/Cargo.toml b/...ch17-async-await/listing-17-43/Cargo.toml → ...ch17-async-await/listing-17-34/Cargo.toml
diff --git a/...h17-async-await/listing-17-45/src/main.rs → ...h17-async-await/listing-17-34/src/main.rs b/...h17-async-await/listing-17-45/src/main.rs → ...h17-async-await/listing-17-34/src/main.rs
@@ -16,10 +16,10 @@ fn main() {
     })
 }
 
+// ANCHOR: messages
 fn get_messages() -> impl Stream<Item = String> {
     let (tx, rx) = trpl::channel();
 
-    // ANCHOR: messages
     trpl::spawn_task(async move {
         let messages = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"];
         for (index, message) in messages.into_iter().enumerate() {
@@ -29,7 +29,7 @@ fn get_messages() -> impl Stream<Item = String> {
             tx.send(format!("Message: '{message}'")).unwrap();
         }
     });
-    // ANCHOR_END: messages
 
     ReceiverStream::new(rx)
 }
+// ANCHOR_END: messages
diff --git a/listings/ch17-async-await/listing-17-41/src/main.rs b/listings/ch17-async-await/listing-17-41/src/main.rs
diff --git a/listings/ch17-async-await/listing-17-43/src/main.rs b/listings/ch17-async-await/listing-17-43/src/main.rs