OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge fall out of removing fmt!

This commit is contained in:
Alex Crichton 2013-09-30 23:21:54 -07:00
parent 1f52cf439b
commit dec37051dd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/os.rs
View File

@ -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());
}
}
}

2
src/test/run-pass/issue-9446.rs
View File

@ -16,7 +16,7 @@ impl Wrapper {
}
pub fn say_hi(&self) {
println(fmt!("hello %s", **self));
println!("hello {}", **self);
}
}