Test fixes and rebase conflicts, round 1

This commit is contained in:
Alex Crichton 2015-03-24 16:48:50 -07:00
parent 19cd00094c
commit efaef24304

View file

@ -183,6 +183,7 @@ impl File {
///
/// ```no_run
/// use std::fs::File;
/// use std::io::prelude::*;
///
/// # fn foo() -> std::io::Result<()> {
/// let mut f = try!(File::create("foo.txt"));
@ -211,6 +212,7 @@ impl File {
///
/// ```no_run
/// use std::fs::File;
/// use std::io::prelude::*;
///
/// # fn foo() -> std::io::Result<()> {
/// let mut f = try!(File::create("foo.txt"));