Test fixes and rebase conflicts, round 1

diff --git a/src/libstd/fs/mod.rs b/src/libstd/fs/mod.rs
index ab7675e4646c56dd6071b9c216c475e17d9cc049..c1253706832df6e87667aeafbc1901b17962e5aa 100644 (file)
--- a/src/libstd/fs/mod.rs
+++ b/src/libstd/fs/mod.rs
@@ -183,6 +183,7 @@ pub fn path(&self) -> Option<&Path> {
     ///
     /// ```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 @@ pub fn sync_all(&self) -> io::Result<()> {
     ///
     /// ```no_run
     /// use std::fs::File;
+    /// use std::io::prelude::*;
     ///
     /// # fn foo() -> std::io::Result<()> {
     /// let mut f = try!(File::create("foo.txt"));