bauer/xdrfile
1
0
Fork 0
mirror of https://github.com/dnlbauer/xdrfile.git synced 2026-09-11 06:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

single error type for cstring conversion

Browse Source
This commit is contained in:
daniel
2020-11-16 11:50:40 +01:00
parent abe7022233
commit ee7a266bb7
2 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/errors.rs
View File

@@ -14,9 +14,7 @@ pub enum Error {
/// C API failed to open a file (No return code provided)
CouldNotOpen { path: PathBuf, mode: FileMode },
/// A path could not be converted to &OsStr
InvalidOsStr,
/// A path could not be converted to &CStr because it had a null byte
NullInStr(std::ffi::NulError),
InvalidOsStr(Option<std::ffi::NulError>),
/// Checking the number of atoms failed while reading a frame
CouldNotCheckNAtoms(Box<Error>),
/// Error for an out-of-range numeric conversion
@@ -61,7 +59,13 @@ impl std::error::Error for Error {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
use Error::*;
match &self {
NullInStr(err) => Some(err),
InvalidOsStr(err) => {
if let Some(err) = err {
Some(err)
} else {
None
}
},
CouldNotCheckNAtoms(err) => Some(err.as_ref()),
_ => None,
}
@@ -75,12 +79,6 @@ impl From<(ErrorCode, ErrorTask)> for Error {
}
}
impl From<std::ffi::NulError> for Error {
fn from(err: std::ffi::NulError) -> Self {
Self::NullInStr(err)
}
}
impl From<(&Path, FileMode)> for Error {
fn from(value: (&Path, FileMode)) -> Self {
let (path, mode) = value;
@@ -119,9 +117,8 @@ impl std::fmt::Display for Error {
CouldNotOpen { path, mode } => {
write!(f, "Could not open file at {:?} in mode {:?}", path, mode)
}
InvalidOsStr => write!(f, "Paths must be valid unicode on this platform"),
NullInStr(_err) => write!(f, "Paths cannot include null bytes"),
CouldNotCheckNAtoms(_err) => {
InvalidOsStr(_) => write!(f, "Cannot convert path to CString."),
CouldNotCheckNAtoms(_) => {
write!(f, "Failed to read number of atoms in trajectory file")
}
OutOfRange {
@@ -249,8 +246,6 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
#[cfg(test)]
mod tests {
use super::*;
use std::ffi::CString;
use std::ffi::NulError;
#[test]
fn test_is_eof() {
@@ -294,12 +289,6 @@ mod tests {
#[test]
fn test_from_correct_type() {
let nul_err: NulError = CString::new(b"foo\0".to_vec()).unwrap_err();
let nul_err2: NulError = CString::new(b"foo\0".to_vec()).unwrap_err();
let err = Error::from(nul_err);
let expected = Error::NullInStr(nul_err2);
assert_eq!(expected, err);
let code = 3.into();
let task = ErrorTask::Read;
let expected = Error::CApiError { code, task };