From dec37051dd01b3faf921163a5d8370223ff77682 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 30 Sep 2013 23:21:54 -0700
Subject: [PATCH] Merge fall out of removing fmt!

---
 src/libstd/os.rs                | 8 ++++----
 src/test/run-pass/issue-9446.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 6d56aab3ec9d..7b9bb249a3cc 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -1164,7 +1164,7 @@ pub fn last_os_error() -> ~str {
                                          len as DWORD,
                                          ptr::null());
                 if res == 0 {
-                    fail2!("[%?] FormatMessage failure", errno());
+                    fail2!("[{}] FormatMessage failure", errno());
                 }
             }
 
@@ -1596,15 +1596,15 @@ impl Drop for MemoryMap {
                     if libc::VirtualFree(self.data as *mut c_void,
                                          self.len,
                                          libc::MEM_RELEASE) == FALSE {
-                        error!(format!("VirtualFree failed: {}", errno()));
+                        error2!("VirtualFree failed: {}", errno());
                     }
                 },
                 MapFile(mapping) => {
                     if libc::UnmapViewOfFile(self.data as LPCVOID) == FALSE {
-                        error!(format!("UnmapViewOfFile failed: {}", errno()));
+                        error2!("UnmapViewOfFile failed: {}", errno());
                     }
                     if libc::CloseHandle(mapping as HANDLE) == FALSE {
-                        error!(format!("CloseHandle failed: {}", errno()));
+                        error2!("CloseHandle failed: {}", errno());
                     }
                 }
             }
diff --git a/src/test/run-pass/issue-9446.rs b/src/test/run-pass/issue-9446.rs
index e97960b3f020..542d1e611ac6 100644
--- a/src/test/run-pass/issue-9446.rs
+++ b/src/test/run-pass/issue-9446.rs
@@ -16,7 +16,7 @@ impl Wrapper {
     }
 
     pub fn say_hi(&self) {
-        println(fmt!("hello %s", **self));
+        println!("hello {}", **self);
     }
 }