rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

std: Remove io::io_error

Browse Source 
* All I/O now returns IoResult<T> = Result<T, IoError>
* All formatting traits now return fmt::Result = IoResult<()>
* The if_ok!() macro was added to libstd
This commit is contained in:
Alex Crichton
2014-01-29 16:33:57 -08:00
parent be4fc63809
commit ece8a8f520
35 changed files with 918 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/os.rs
View File

@@ -929,7 +929,7 @@ pub enum MapError {
}
impl fmt::Show for MapError {
fn fmt(val: &MapError, out: &mut fmt::Formatter) {
fn fmt(val: &MapError, out: &mut fmt::Formatter) -> fmt::Result {
let str = match *val {
ErrFdNotAvail => "fd not available for reading or writing",
ErrInvalidFd => "Invalid fd",
@@ -944,23 +944,19 @@ impl fmt::Show for MapError {
ErrAlreadyExists => "File mapping for specified file already exists",
ErrZeroLength => "Zero-length mapping not allowed",
ErrUnknown(code) => {
write!(out.buf, "Unknown error = {}", code);
return
return write!(out.buf, "Unknown error = {}", code)
},
ErrVirtualAlloc(code) => {
write!(out.buf, "VirtualAlloc failure = {}", code);
return
return write!(out.buf, "VirtualAlloc failure = {}", code)
},
ErrCreateFileMappingW(code) => {
format!("CreateFileMappingW failure = {}", code);
return
return write!(out.buf, "CreateFileMappingW failure = {}", code)
},
ErrMapViewOfFile(code) => {
write!(out.buf, "MapViewOfFile failure = {}", code);
return
return write!(out.buf, "MapViewOfFile failure = {}", code)
}
};
write!(out.buf, "{}", str);
write!(out.buf, "{}", str)
}
}