---

yaml
---
r: 108522
b: refs/heads/dist-snap
c: e61c7fd
h: refs/heads/master
v: v3

Author: lilyball

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 068781e5aa6d2b6af04aeb6c44de4296a5a0b004
+refs/heads/dist-snap: e61c7fd3e20d38d7bc55b0ae979fae05744e194f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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");
     /// ```
     ///

branches/dist-snap/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 })
 }
 

branches/dist-snap/src/llvm

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

branches/dist-snap/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());