From 0dc48b47a8c67eb28e7b89a6c0810dc9446377f7 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 7 Jan 2015 18:53:58 -0800
Subject: Test fixes and rebase conflicts

---
 src/libstd/fmt.rs            | 2 +-
 src/libstd/io/mod.rs         | 2 +-
 src/libstd/rand/mod.rs       | 2 +-
 src/libstd/sys/windows/fs.rs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/fmt.rs b/src/libstd/fmt.rs
index 1623b6452b7..96fff64d221 100644
--- a/src/libstd/fmt.rs
+++ b/src/libstd/fmt.rs
@@ -175,7 +175,7 @@
 //! use std::f64;
 //! use std::num::Float;
 //!
-//! #[deriving(Show)]
+//! #[derive(Show)]
 //! struct Vector2D {
 //!     x: int,
 //!     y: int,
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index c71ab514695..1c48b20c444 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -1284,7 +1284,7 @@ impl<'a> Writer for &'a mut (Writer+'a) {
 ///     process_input(tee);
 /// }
 ///
-/// println!("input processed: {}", output);
+/// println!("input processed: {:?}", output);
 /// # }
 /// ```
 pub struct RefWriter<'a, W:'a> {
diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs
index 91e3b4a0687..3fa1efe1ccd 100644
--- a/src/libstd/rand/mod.rs
+++ b/src/libstd/rand/mod.rs
@@ -403,7 +403,7 @@ pub fn random<T: Rand>() -> T {
 ///
 /// let mut rng = thread_rng();
 /// let sample = sample(&mut rng, range(1i, 100), 5);
-/// println!("{}", sample);
+/// println!("{:?}", sample);
 /// ```
 pub fn sample<T, I: Iterator<Item=T>, R: Rng>(rng: &mut R,
                                          mut iter: I,
diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs
index f8c75335b35..a7330f7c67c 100644
--- a/src/libstd/sys/windows/fs.rs
+++ b/src/libstd/sys/windows/fs.rs
@@ -270,7 +270,7 @@ pub fn readdir(p: &Path) -> IoResult<Vec<Path>> {
                             return Err(IoError {
                                 kind: io::InvalidInput,
                                 desc: "path was not valid UTF-16",
-                                detail: Some(format!("path was not valid UTF-16: {}", filename)),
+                                detail: Some(format!("path was not valid UTF-16: {:?}", filename)),
                             })
                         }, // FIXME #12056: Convert the UCS-2 to invalid utf-8 instead of erroring
                     }
-- 
cgit 1.4.1-3-g733a5