about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-10-03 22:32:02 +0000
committerbors <bors@rust-lang.org>2014-10-03 22:32:02 +0000
commitc348550f4f188bd127b85ed20b1e63fd42622e96 (patch)
treefbc28f1418e481bf537d9f94d3b8205825529054
parentae81c89f34f1ac2cdb596cf216612e94822a8466 (diff)
parent71f752bbc4eb2a280cd6f6611ba46075a7fdffd1 (diff)
downloadrust-c348550f4f188bd127b85ed20b1e63fd42622e96.tar.gz
rust-c348550f4f188bd127b85ed20b1e63fd42622e96.zip
auto merge of #17743 : steveklabnik/rust/receiver_fix, r=alexcrichton
-rw-r--r--src/doc/guide.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/guide.md b/src/doc/guide.md
index 7805b3d5681..0dc8859c328 100644
--- a/src/doc/guide.md
+++ b/src/doc/guide.md
@@ -5074,7 +5074,7 @@ The `channel()` function returns two endpoints: a `Receiver<T>` and a
 `Sender<T>`. You can use the `.send()` method on the `Sender<T>` end, and
 receive the message on the `Receiver<T>` side with the `recv()` method.  This
 method blocks until it gets a message. There's a similar method, `.try_recv()`,
-which returns an `Option<T>` and does not block.
+which returns an `Result<T, TryRecvError>` and does not block.
 
 If you want to send messages to the task as well, create two channels!