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

Fix a few casts after rebase

Browse Source
This commit is contained in:
Josh Mitchell
2020-11-14 13:06:53 +11:00
parent 1192188cb0
commit ecccd6aca4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib.rs
View File

@@ -80,9 +80,8 @@ use std::cell::Cell;
use std::convert::{TryFrom, TryInto}; use std::convert::{TryFrom, TryInto};
use std::ffi::CString; use std::ffi::CString;
use std::io; use std::io;
use std::path::{Path, PathBuf};
use std::convert::TryInto;
use std::io::SeekFrom; use std::io::SeekFrom;
use std::path::{Path, PathBuf};
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub enum FileMode { pub enum FileMode {
@@ -179,12 +178,15 @@ impl XDRFile {
impl io::Seek for XDRFile { impl io::Seek for XDRFile {
fn seek(&mut self, pos: io::SeekFrom) -> io::Result<u64> { fn seek(&mut self, pos: io::SeekFrom) -> io::Result<u64> {
let (whence, pos) = match pos { let (whence, pos) = match pos {
SeekFrom::Start(u) => (0, u as i64), SeekFrom::Start(u) => (
0,
i64::try_from(u).expect("Seek position did not fit in i64"),
),
SeekFrom::Current(i) => (1, i), SeekFrom::Current(i) => (1, i),
SeekFrom::End(i) => (2, i), SeekFrom::End(i) => (2, i),
}; };
unsafe { unsafe {
let code = xdr_seek::xdr_seek(self.xdrfile, pos, whence) as u32; let code = xdr_seek::xdr_seek(self.xdrfile, pos, whence);
match check_code(code, ErrorTask::Seek) { match check_code(code, ErrorTask::Seek) {
None => Ok(self.tell()), None => Ok(self.tell()),
Some(err) => Err(io::Error::new(io::ErrorKind::Other, err)), Some(err) => Err(io::Error::new(io::ErrorKind::Other, err)),
@@ -488,9 +490,9 @@ impl io::Seek for TRRTrajectory {
mod tests { mod tests {
use super::*; use super::*;
use tempfile::NamedTempFile;
use std::io::Seek; use std::io::Seek;
use std::io::Write; use std::io::Write;
use tempfile::NamedTempFile;
#[test] #[test]
fn test_read_write_xtc() -> Result<()> { fn test_read_write_xtc() -> Result<()> {