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

Corrected a few ErrorTasks

Browse Source
This commit is contained in:
Josh Mitchell
2020-11-15 18:36:54 +11:00
parent 62462ed8c3
commit 43cc36de99
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib.rs
View File

@@ -287,7 +287,7 @@ impl Trajectory for XTCTrajectory {
if let Some(err) = check_code(code, ErrorTask::Read) { if let Some(err) = check_code(code, ErrorTask::Read) {
return Err(err); return Err(err);
} }
frame.step = to!(step, ErrorTask::ReadNumAtoms)?; frame.step = to!(step, ErrorTask::Read)?;
Ok(()) Ok(())
} }
} }
@@ -314,7 +314,7 @@ impl Trajectory for XTCTrajectory {
fn flush(&mut self) -> Result<()> { fn flush(&mut self) -> Result<()> {
unsafe { unsafe {
let code = xdr_seek::xdr_flush(self.handle.xdrfile); let code = xdr_seek::xdr_flush(self.handle.xdrfile);
if let Some(err) = check_code(code, ErrorTask::Read) { if let Some(err) = check_code(code, ErrorTask::Flush) {
Err(err) Err(err)
} else { } else {
Ok(()) Ok(())
@@ -416,7 +416,7 @@ impl Trajectory for TRRTrajectory {
if let Some(err) = check_code(code, ErrorTask::Read) { if let Some(err) = check_code(code, ErrorTask::Read) {
return Err(err); return Err(err);
} }
frame.step = to!(step, ErrorTask::ReadNumAtoms)?; frame.step = to!(step, ErrorTask::Read)?;
Ok(()) Ok(())
} }
} }
@@ -807,13 +807,14 @@ mod tests {
fn test_to() -> Result<()> { fn test_to() -> Result<()> {
assert_eq!(24234_i32, to!(24234_usize, ErrorTask::Write)?); assert_eq!(24234_i32, to!(24234_usize, ErrorTask::Write)?);
let big_number = 3_294_967_295_usize;
let expected: Result<i32> = Err(Error::OutOfRange { let expected: Result<i32> = Err(Error::OutOfRange {
name: "3_294_967_295_usize", name: "big_number",
task: ErrorTask::Write, task: ErrorTask::Write,
value: "3294967295".to_string(), value: "3294967295".to_string(),
target: "i32", target: "i32",
}); });
assert_eq!(expected, to!(3_294_967_295_usize, ErrorTask::Write)); assert_eq!(expected, to!(big_number, ErrorTask::Write));
Ok(()) Ok(())
} }