diff --git a/tools/src/elf.rs b/tools/src/elf.rs index 8d1e80d55..47fc2cd55 100644 --- a/tools/src/elf.rs +++ b/tools/src/elf.rs @@ -126,11 +126,10 @@ impl fmt::Display for ElfReadError { pub fn read_program>(filename: P) -> Result { let mut b = Vec::new(); { - let mut fi = File::open(filename).or_else(|x| Err(ElfReadError::OpenElfError(x)))?; - fi.read_to_end(&mut b) - .or_else(|x| Err(ElfReadError::ReadFileError(x)))?; + let mut fi = File::open(filename).map_err(ElfReadError::OpenElfError)?; + fi.read_to_end(&mut b).map_err(ElfReadError::ReadFileError)?; } - let elf = ElfFile::new(&b).or_else(|x| Err(ElfReadError::ParseElfError(x)))?; + let elf = ElfFile::new(&b).map_err(|x| ElfReadError::ParseElfError(x))?; let entry_point = elf.header.pt2.entry_point() as u32; let mut program_data = Cursor::new(Vec::new()); @@ -203,8 +202,7 @@ pub fn read_program>(filename: P) -> Result>(filename: P) -> Result>(filename: P) -> Result>(filename: P) -> Result { let mut b = Vec::new(); { - let mut fi = File::open(filename).or_else(|x| Err(ElfReadError::OpenElfError(x)))?; - fi.read_to_end(&mut b) - .or_else(|x| Err(ElfReadError::ReadFileError(x)))?; + let mut fi = File::open(filename).map_err(ElfReadError::OpenElfError)?; + fi.read_to_end(&mut b).map_err(ElfReadError::ReadFileError)?; } - let elf = ElfFile::new(&b).or_else(|x| Err(ElfReadError::ParseElfError(x)))?; + let elf = ElfFile::new(&b).map_err(|x| ElfReadError::ParseElfError(x))?; let entry_point = elf.header.pt2.entry_point() as u32; let mut program_data = Cursor::new(Vec::new()); @@ -341,11 +335,9 @@ pub fn read_minielf>(filename: P) -> Result>(filename: P) -> Result (&str, u32) { pub fn parse_u32(value: &str) -> Result { let (value, base) = get_base(value); - u32::from_str_radix(value, base) - .or_else(|e| Err(ConfigError::NumberParseError(value.to_owned(), e))) + u32::from_str_radix(value, base).map_err(|e| ConfigError::NumberParseError(value.to_owned(), e)) } pub fn parse_csr_csv(filename: &str) -> Result {