---

yaml
---
r: 102055
b: refs/heads/master
c: e61c7fd
h: refs/heads/master
i:
  102053: 6b836e5
  102051: 31249dc
  102047: 219d7a4
v: v3

Author: lilyball

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 068781e5aa6d2b6af04aeb6c44de4296a5a0b004
+refs/heads/master: e61c7fd3e20d38d7bc55b0ae979fae05744e194f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/src/libstd/io/mod.rs

@@ -26,9 +26,11 @@ Some examples of obvious things you might want to do
 * Read lines from stdin
 
     ```rust
-    use std::io;
+    use std::io::BufferedReader;
+    use std::io::stdin;
 
-    for line in io::stdin().lines() {
+    let mut stdin = BufferedReader::new(stdin());
+    for line in stdin.lines() {
         print!("{}", line);
     }
     ```
@@ -1095,9 +1097,10 @@ pub trait Buffer: Reader {
     /// # Example
     ///
     /// ```rust
-    /// use std::io;
+    /// use std::io::{BufferedReader, stdin};
+    ///
+    /// let mut reader = BufferedReader::new(stdin());
     ///
-    /// let mut reader = io::stdin();
     /// let input = reader.read_line().ok().unwrap_or(~"nothing");
     /// ```
     ///

trunk/src/libstd/io/stdio.rs

@@ -30,7 +30,7 @@ out.write(bytes!("Hello, world!"));
 use container::Container;
 use fmt;
 use io::{Reader, Writer, IoResult, IoError, OtherIoError,
-         standard_error, EndOfFile, LineBufferedWriter, BufferedReader};
+         standard_error, EndOfFile, LineBufferedWriter};
 use libc;
 use mem::replace;
 use option::{Option, Some, None};
@@ -86,21 +86,8 @@ fn src<T>(fd: libc::c_int, readable: bool, f: |StdSource| -> T) -> T {
 
 /// Creates a new non-blocking handle to the stdin of the current process.
 ///
-/// The returned handled is buffered by default with a `BufferedReader`. If
-/// buffered access is not desired, the `stdin_raw` function is provided to
-/// provided unbuffered access to stdin.
-///
-/// See `stdout()` for more notes about this function.
-pub fn stdin() -> BufferedReader<StdReader> {
-    BufferedReader::new(stdin_raw())
-}
-
-/// Creates a new non-blocking handle to the stdin of the current process.
-///
-/// Unlike `stdin()`, the returned reader is *not* a buffered reader.
-///
-/// See `stdout()` for more notes about this function.
-pub fn stdin_raw() -> StdReader {
+/// See `stdout()` for notes about this function.
+pub fn stdin() -> StdReader {
     src(libc::STDIN_FILENO, true, |src| StdReader { inner: src })
 }
 

trunk/src/llvm

@@ -1 +1 @@
-Subproject commit f5f1ffea207b6b380127ff34f14015ae005d1413
+Subproject commit b015ecddd3129490fa26e5278a1acee79f2ee5ef

trunk/src/test/bench/sudoku.rs

@@ -278,7 +278,7 @@ fn main() {
     let mut sudoku = if use_default {
         Sudoku::from_vec(&DEFAULT_SUDOKU)
     } else {
-        Sudoku::read(io::stdin())
+        Sudoku::read(BufferedReader::new(io::stdin()))
     };
     sudoku.solve();
     sudoku.write(&mut io::stdout());