---

yaml
---
r: 235496
b: refs/heads/stable
c: 4fb02a3
h: refs/heads/master
v: v3

Author: steveklabnik

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 664449ac6e4b607722af4c3defe56af1a40c0a77
+refs/heads/stable: 4fb02a391d7e1ef3e94d00f10af18304e5c1b53f
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/libstd/io/mod.rs

@@ -149,22 +149,23 @@ fn read_to_end<R: Read + ?Sized>(r: &mut R, buf: &mut Vec<u8>) -> Result<usize>
 ///
 /// ```
 /// use std::io;
+/// use std::io::prelude::*;
 /// use std::fs::File;
-/// use std::io::Read;
 ///
 /// # fn foo() -> io::Result<()> {
 /// let mut f = try!(File::open("foo.txt"));
-/// let mut buffer = Vec::new();
+/// let mut buffer = [0; 10];
 ///
-/// // read some bytes
-/// f.read(&mut buffer).unwrap();
+/// // read up to 10 bytes
+/// try!(f.read(&mut buffer));
 ///
+/// let mut buffer = vec![0; 10];
 /// // read the whole file
-/// f.read_to_end(&mut buffer).unwrap();
+/// try!(f.read_to_end(&mut buffer));
 ///
 /// // read into a String, so that you don't need to do the conversion.
 /// let mut buffer = String::new();
-/// f.read_to_string(&mut buffer).unwrap();
+/// try!(f.read_to_string(&mut buffer));
 ///
 /// // and more! See the other methods for more details.
 /// # Ok(())
@@ -910,7 +911,7 @@ fn read_until<R: BufRead + ?Sized>(r: &mut R, delim: u8, buf: &mut Vec<u8>)
 ///
 /// ```
 /// use std::io;
-/// use std::io::BufRead;
+/// use std::io::prelude::*;
 ///
 /// let stdin = io::stdin();
 /// for line in stdin.lock().lines() {
@@ -928,10 +929,9 @@ fn read_until<R: BufRead + ?Sized>(r: &mut R, delim: u8, buf: &mut Vec<u8>)
 /// [file]: ../fs/struct.File.html
 ///
 /// ```
-/// use std::io;
+/// use std::io::{self, BufReader};
+/// use std::io::prelude::*;
 /// use std::fs::File;
-/// use std::io::BufRead;
-/// use std::io::BufReader;
 ///
 /// # fn foo() -> io::Result<()> {
 /// let f = try!(File::open("foo.txt"));