about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorTyler Bindon <martica@martica.org>2013-01-25 12:29:51 -0700
committerTyler Bindon <martica@martica.org>2013-01-25 19:42:23 -0700
commit3a5d2cdbf3aff91b57bc6b70dd429ae5e771d054 (patch)
treedfbf800eac335b9f63b91d90f0132c56b18980e5 /src/libstd
parent7ff7489dc62bdcc0dbd507c52cba90d47cfdd129 (diff)
downloadrust-3a5d2cdbf3aff91b57bc6b70dd429ae5e771d054.tar.gz
rust-3a5d2cdbf3aff91b57bc6b70dd429ae5e771d054.zip
Fix Option camel case in comments
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/net_tcp.rs8
-rw-r--r--src/libstd/rope.rs2
-rw-r--r--src/libstd/timer.rs8
3 files changed, 9 insertions, 9 deletions
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index aa5eec2b43c..3e9a9756a81 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -468,7 +468,7 @@ fn read_future(sock: &TcpSocket, timeout_msecs: uint)
  *     }
  *     // this callback is ran when a new connection arrives
  *     {|new_conn, kill_ch|
- *     let cont_po = core::comm::port::<option<tcp_err_data>>();
+ *     let cont_po = core::comm::port::<Option<tcp_err_data>>();
  *     let cont_ch = core::comm::chan(cont_po);
  *     task::spawn {||
  *         let accept_result = net::tcp::accept(new_conn);
@@ -484,9 +484,9 @@ fn read_future(sock: &TcpSocket, timeout_msecs: uint)
  *     };
  *     match core::comm::recv(cont_po) {
  *       // shut down listen()
- *       some(err_data) { core::comm::send(kill_chan, some(err_data)) }
+ *       Some(err_data) { core::comm::send(kill_chan, Some(err_data)) }
  *       // wait for next connection
- *       none {}
+ *       None {}
  *     }
  * };
  * ~~~~~~~~~~~
@@ -593,7 +593,7 @@ pub fn accept(new_conn: TcpNewConnection)
  * callback's arguments are:
  *     * `new_conn` - an opaque type that can be passed to
  *     `net::tcp::accept` in order to be converted to a `tcp_socket`.
- *     * `kill_ch` - channel of type `core::comm::chan<option<tcp_err_data>>`.
+ *     * `kill_ch` - channel of type `core::comm::chan<Option<tcp_err_data>>`.
  *     this channel can be used to send a message to cause `listen` to begin
  *     closing the underlying libuv data structures.
  *
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index 8c6d77c8828..ded0f316a15 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -893,7 +893,7 @@ pub mod node {
      * # Return value
      *
      * * `option::None` if no transformation happened
-     * * `option::some(x)` otherwise, in which case `x` has the same contents
+     * * `option::Some(x)` otherwise, in which case `x` has the same contents
      *    as `node` bot lower height and/or fragmentation.
      */
     pub fn bal(node: @Node) -> Option<@Node> {
diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs
index f8147c532e6..ce6231afa67 100644
--- a/src/libstd/timer.rs
+++ b/src/libstd/timer.rs
@@ -100,11 +100,11 @@ pub fn sleep(iotask: IoTask, msecs: uint) {
 }
 
 /**
- * Receive on a port for (up to) a specified time, then return an `option<T>`
+ * Receive on a port for (up to) a specified time, then return an `Option<T>`
  *
  * This call will block to receive on the provided port for up to the
  * specified timeout. Depending on whether the provided port receives in that
- * time period, `recv_timeout` will return an `option<T>` representing the
+ * time period, `recv_timeout` will return an `Option<T>` representing the
  * result.
  *
  * # Arguments
@@ -115,9 +115,9 @@ pub fn sleep(iotask: IoTask, msecs: uint) {
  *
  * # Returns
  *
- * An `option<T>` representing the outcome of the call. If the call `recv`'d
+ * An `Option<T>` representing the outcome of the call. If the call `recv`'d
  * on the provided port in the allotted timeout period, then the result will
- * be a `some(T)`. If not, then `none` will be returned.
+ * be a `Some(T)`. If not, then `None` will be returned.
  */
 pub fn recv_timeout<T: Copy Owned>(iotask: IoTask,
                                    msecs: uint,