Skip to content

Commit dec3705

Browse files
committed
Merge fall out of removing fmt!
1 parent 1f52cf4 commit dec3705

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/libstd/os.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ pub fn last_os_error() -> ~str {
11641164
len as DWORD,
11651165
ptr::null());
11661166
if res == 0 {
1167-
fail2!("[%?] FormatMessage failure", errno());
1167+
fail2!("[{}] FormatMessage failure", errno());
11681168
}
11691169
}
11701170

@@ -1596,15 +1596,15 @@ impl Drop for MemoryMap {
15961596
if libc::VirtualFree(self.data as *mut c_void,
15971597
self.len,
15981598
libc::MEM_RELEASE) == FALSE {
1599-
error!(format!("VirtualFree failed: {}", errno()));
1599+
error2!("VirtualFree failed: {}", errno());
16001600
}
16011601
},
16021602
MapFile(mapping) => {
16031603
if libc::UnmapViewOfFile(self.data as LPCVOID) == FALSE {
1604-
error!(format!("UnmapViewOfFile failed: {}", errno()));
1604+
error2!("UnmapViewOfFile failed: {}", errno());
16051605
}
16061606
if libc::CloseHandle(mapping as HANDLE) == FALSE {
1607-
error!(format!("CloseHandle failed: {}", errno()));
1607+
error2!("CloseHandle failed: {}", errno());
16081608
}
16091609
}
16101610
}

src/test/run-pass/issue-9446.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl Wrapper {
1616
}
1717

1818
pub fn say_hi(&self) {
19-
println(fmt!("hello %s", **self));
19+
println!("hello {}", **self);
2020
}
2121
}
2222

0 commit comments

Comments
 (0)