simon/brd
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mini_parser: Use custom error for EOF

Browse source
This commit is contained in:
Simon Bruder 2020-08-07 13:05:03 +02:00
parent ee84247a1d
commit def3b7269d
No known key found for this signature in database
GPG key ID: 6F03E0000CC5B62F
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mini_parser.rs
View file

@ -12,6 +12,8 @@ pub enum MiniParserError {
TryFromIntError(#[from] num::TryFromIntError), TryFromIntError(#[from] num::TryFromIntError),
#[error(transparent)] #[error(transparent)]
IOError(#[from] io::Error), IOError(#[from] io::Error),
#[error("file ended while there was data left to process")]
UnexpectedEof,
} }
/// Provides convenience methods for parsing binary formats. /// Provides convenience methods for parsing binary formats.
@ -43,13 +45,7 @@ impl<R: io::Read + ?Sized> MiniParser for R {}
/// Gets the requested `range` from `slice` and errors with `UnexpectedEof` when range does not fit /// Gets the requested `range` from `slice` and errors with `UnexpectedEof` when range does not fit
/// in slice. /// in slice.
pub fn get_slice_range(slice: &[u8], range: Range<usize>) -> Result<&[u8], MiniParserError> { pub fn get_slice_range(slice: &[u8], range: Range<usize>) -> Result<&[u8], MiniParserError> {
slice.get(range).ok_or_else(|| { slice.get(range).ok_or(MiniParserError::UnexpectedEof)
io::Error::new(
io::ErrorKind::UnexpectedEof,
"File ended while there was data left to process",
)
.into()
})
} }
#[cfg(test)] #[cfg(test)]