From 5a578e4dac2721b324aff1665b7d2afbe00b5fb3 Mon Sep 17 00:00:00 2001 From: Determinant Date: Mon, 24 Aug 2020 12:46:05 -0400 Subject: bump the version of libaio-futures --- src/lib.rs | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/lib.rs b/src/lib.rs index 45d4843..be8993b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -107,17 +107,14 @@ impl WALFile for WALFileAIO { } async fn write(&self, offset: WALPos, data: WALBytes) -> Result<(), ()> { - self.aiomgr - .write(self.fd, offset, data, None) - .await - .or_else(|_| Err(())) - .and_then(|(nwrote, data)| { - if nwrote == data.len() { - Ok(()) - } else { - Err(()) - } - }) + let (res, data) = self.aiomgr.write(self.fd, offset, data, None).await; + res.or_else(|_| Err(())).and_then(|nwrote| { + if nwrote == data.len() { + Ok(()) + } else { + Err(()) + } + }) } fn read( @@ -125,11 +122,11 @@ impl WALFile for WALFileAIO { offset: WALPos, length: usize, ) -> Result, ()> { - block_on(self.aiomgr.read(self.fd, offset, length, None)) - .or_else(|_| Err(())) - .and_then(|(nread, data)| { - Ok(if nread == length { Some(data) } else { None }) - }) + let (res, data) = + block_on(self.aiomgr.read(self.fd, offset, length, None)); + res.or_else(|_| Err(())).and_then(|nread| { + Ok(if nread == length { Some(data) } else { None }) + }) } } -- cgit v1.2.3-70-g09d2