Test fixes and rebase conflicts, round 1

rust-lang · Mar 24, 2015 · efaef24 · efaef24
1 parent 19cd000
commit efaef24
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/libstd/fs/mod.rs b/src/libstd/fs/mod.rs
@@ -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"));