---

yaml
---
r: 40742
b: refs/heads/dist-snap
c: 04d9ea6
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 1b481017acfc51063d6ab69de6e310634ceb6804
+refs/heads/dist-snap: 04d9ea6f32393c2e72e6b75b3c52c473dc49bce8
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/pipes.rs

@@ -416,7 +416,7 @@ pub fn recv<T: Send, Tbuffer: Send>(p: RecvPacketBuffered<T, Tbuffer>) -> T {
 
 /** Attempts to receive a message from a pipe.
 
-Returns `none` if the sender has closed the connection without sending
+Returns `None` if the sender has closed the connection without sending
 a message, or `Some(T)` if a message was received.
 
 */
@@ -1149,7 +1149,7 @@ pub fn SharedChan<T:Send>(c: Chan<T>) -> SharedChan<T> {
 
 /// Receive a message from one of two endpoints.
 pub trait Select2<T: Send, U: Send> {
-    /// Receive a message or return `none` if a connection closes.
+    /// Receive a message or return `None` if a connection closes.
     fn try_select() -> Either<Option<T>, Option<U>>;
     /// Receive a message or fail if a connection closes.
     fn select() -> Either<T, U>;