---

yaml
---
r: 73246
b: refs/heads/dist-snap
c: ebdb0de
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: 1065a92bf3bbe1f4bb11b7b7268a91529bbf8f89
+refs/heads/dist-snap: ebdb0dee272829f2410edd51acdb12f20721ce42
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -84,29 +84,25 @@ pub trait Reader {
 
     // FIXME (#2982): This should probably return an error.
     /**
-    * Reads bytes and puts them into `bytes`, advancing the cursor. Returns the
-    * number of bytes read.
+    * Reads bytes and puts them into `bytes`. Returns the number of
+    * bytes read.
     *
     * The number of bytes to be read is `len` or the end of the file,
     * whichever comes first.
     *
     * The buffer must be at least `len` bytes long.
     *
-    * `read` is conceptually similar to C's `fread`.
-    *
     * # Examples
     *
     * None right now.
     */
     fn read(&self, bytes: &mut [u8], len: uint) -> uint;
 
     /**
-    * Reads a single byte, advancing the cursor.
+    * Reads a single byte.
     *
     * In the case of an EOF or an error, returns a negative value.
     *
-    * `read_byte` is conceptually similar to C's `getc` function.
-    *
     * # Examples
     *
     * None right now.
@@ -116,8 +112,6 @@ pub trait Reader {
     /**
     * Returns a boolean value: are we currently at EOF?
     *
-    * `eof` is conceptually similar to C's `feof` function.
-    *
     * # Examples
     *
     * None right now.
@@ -130,8 +124,6 @@ pub trait Reader {
     * Takes an optional SeekStyle, which affects how we seek from the
     * position. See `SeekStyle` docs for more details.
     *
-    * `seek` is conceptually similar to C's `fseek`.
-    *
     * # Examples
     *
     * None right now.
@@ -141,8 +133,6 @@ pub trait Reader {
     /**
     * Returns the current position within the stream.
     *
-    * `tell` is conceptually similar to C's `ftell` function.
-    *
     * # Examples
     *
     * None right now.
@@ -1020,6 +1010,16 @@ pub fn FILE_reader(f: *libc::FILE, cleanup: bool) -> @Reader {
 // top-level functions that take a reader, or a set of default methods on
 // reader (which can then be called reader)
 
+/**
+* Gives a `Reader` that allows you to read values from standard input.
+*
+* # Examples
+* ~~~
+* let stdin = core::io::stdin();
+* let line = stdin.read_line();
+* core::io::print(line);
+* ~~~
+*/
 pub fn stdin() -> @Reader {
     unsafe {
         @rustrt::rust_get_stdin() as @Reader