From 82249838007dc7271b309a5435bfafd4926db134 Mon Sep 17 00:00:00 2001 From: Hadrien G Date: Thu, 26 Sep 2019 09:39:22 +0200 Subject: [PATCH] Snipe some unnecessary usage of Ok(()) --- src/lib.rs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 551fa4d..ff2923e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -75,8 +75,7 @@ pub mod abomonated; pub unsafe fn encode(typed: &T, write: &mut W) -> IOResult<()> { let slice = std::slice::from_raw_parts(mem::transmute(typed), mem::size_of::()); write.write_all(slice)?; - typed.entomb(write)?; - Ok(()) + typed.entomb(write) } /// Decodes a mutable binary slice into an immutable typed reference. @@ -262,7 +261,7 @@ macro_rules! tuple_abomonate { #[allow(non_snake_case)] #[inline(always)] unsafe fn entomb(&self, write: &mut WRITE) -> IOResult<()> { let ($(ref $ty,)*) = *self; - $($ty.entomb(write)?;)* + $( $ty.entomb(write)?; )* Ok(()) } @@ -356,10 +355,9 @@ impl Abomonation for Option { impl Abomonation for Result { #[inline(always)] unsafe fn entomb(&self, write: &mut W) -> IOResult<()> { match self { - &Ok(ref inner) => inner.entomb(write)?, - &Err(ref inner) => inner.entomb(write)?, - }; - Ok(()) + &Ok(ref inner) => inner.entomb(write), + &Err(ref inner) => inner.entomb(write), + } } #[inline(always)] unsafe fn exhume<'a>(self_: NonNull, bytes: &'a mut[u8]) -> Option<&'a mut [u8]> { @@ -476,8 +474,7 @@ array_abomonate!(32); impl Abomonation for String { #[inline] unsafe fn entomb(&self, write: &mut W) -> IOResult<()> { - write.write_all(self.as_bytes())?; - Ok(()) + write.write_all(self.as_bytes()) } #[inline] @@ -531,8 +528,7 @@ impl Abomonation for Box { #[inline] unsafe fn entomb(&self, bytes: &mut W) -> IOResult<()> { bytes.write_all(std::slice::from_raw_parts(mem::transmute(&**self), mem::size_of::()))?; - (**self).entomb(bytes)?; - Ok(()) + (**self).entomb(bytes) } #[inline]