itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-09-25 12:00:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(examples): Fix typos in chat example

Browse Source 
Rephrase a sentence to not contain the word `join` when we are actually using
`select` to prevent confusion.
This commit is contained in:
oberien 2016-10-14 23:03:46 +02:00
parent bc2f857236
commit 7cf7833631
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/chat.rs
View File

@ -38,8 +38,8 @@ fn main() {
let srv = socket.incoming().for_each(move |(stream, addr)| {
println!("New Connection: {}", addr);
// Create a channel for for our stream, which other sockets will use to
// send us message. Then register our address with the stream to send
// Create a channel for our stream, which other sockets will use to
// send us messages. Then register our address with the stream to send
// data to us.
let (tx, rx) = tokio_core::channel::channel(&handle).unwrap();
connections.borrow_mut().insert(addr, tx);
@ -85,7 +85,7 @@ fn main() {
let conns = connections.borrow_mut();
if let Ok(msg) = message {
// For each open connection except the sender, send the
// string via the channel
// string via the channel.
let iter = conns.iter()
.filter(|&(&k, _)| k != addr)
.map(|(_, v)| v);
@ -111,9 +111,9 @@ fn main() {
(socket_reader, socket_writer)
});
// Now that we've got futures representing each half of the socket, join
// them together and then spawn off the result. Here we use the `select`
// combinator to wait for either half to be done to tear down the other.
// Now that we've got futures representing each half of the socket, we
// use the `select` combinator to wait for either half to be done to
// tear down the other. Then we spawn off the result.
let connections = connections.clone();
let addr = addr;
handle.spawn(pair.and_then(|(reader, writer)| {