Merge fall out of removing fmt!

diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 6d56aab3ec9d47ff6b5dd9528ba8abb475c7c7a1..7b9bb249a3cc4ecf69c2062cbd364c84e41b637c 100644 (file)
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -1164,7 +1164,7 @@ fn FormatMessageW(flags: DWORD,
                                          len as DWORD,
                                          ptr::null());
                 if res == 0 {
-                    fail2!("[%?] FormatMessage failure", errno());
+                    fail2!("[{}] FormatMessage failure", errno());
                 }
             }
 
@@ -1596,15 +1596,15 @@ fn drop(&mut self) {
                     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 e97960b3f0209d3320095f2d6da7c4805686c9e1..542d1e611ac64bb3387665a458b92c959e7cd22c 100644 (file)
--- a/src/test/run-pass/issue-9446.rs
+++ b/src/test/run-pass/issue-9446.rs
@@ -16,7 +16,7 @@ pub fn new(wrapped: ~str) -> Wrapper {
     }
 
     pub fn say_hi(&self) {
-        println(fmt!("hello %s", **self));
+        println!("hello {}", **self);
     }
 }