Merge pull request #23 from nearprotocol/clippy

Fix clippy errors
near · Oct 1, 2019 · c4f982b · c4f982b
2 parents d6816d3 + 4e9522e
commit c4f982b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/borsh-rs/borsh-derive-internal/src/enum_de.rs b/borsh-rs/borsh-derive-internal/src/enum_de.rs
@@ -58,7 +58,7 @@ pub fn enum_de(input: &ItemEnum) -> syn::Result<TokenStream2> {
     }
     let variant_idx = quote! {
         let mut variant_idx = [0u8; std::mem::size_of::<u8>()];
-        reader.read(&mut variant_idx)?;
+        reader.read_exact(&mut variant_idx)?;
         let variant_idx = u8::from_le_bytes(variant_idx);
     };
     if let Some(method_ident) = init_method {

diff --git a/borsh-rs/borsh-derive-internal/src/enum_ser.rs b/borsh-rs/borsh-derive-internal/src/enum_ser.rs
@@ -62,7 +62,7 @@ pub fn enum_ser(input: &ItemEnum) -> syn::Result<TokenStream2> {
         body.extend(quote!(
             #name::#variant_ident #variant_header => {
                 let variant_idx: u8 = #variant_idx;
-                writer.write(&variant_idx.to_le_bytes())?;
+                writer.write_all(&variant_idx.to_le_bytes())?;
                 #variant_body
             }
         ))

diff --git a/borsh-rs/borsh/src/de/mod.rs b/borsh-rs/borsh/src/de/mod.rs
@@ -84,7 +84,7 @@ impl BorshDeserialize for bool {
     #[inline]
     fn deserialize<R: Read>(reader: &mut R) -> Result<Self, Error> {
         let mut buf = [0u8];
-        reader.read(&mut buf)?;
+        reader.read_exact(&mut buf)?;
         Ok(buf[0] == 1)
     }
 }
@@ -110,7 +110,7 @@ impl BorshDeserialize for String {
     fn deserialize<R: Read>(reader: &mut R) -> Result<Self, Error> {
         let len = u32::deserialize(reader)?;
         let mut result = vec![0; len as usize];
-        reader.read(&mut result)?;
+        reader.read_exact(&mut result)?;
         String::from_utf8(result)
             .map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidData, err.to_string()))
     }
@@ -225,7 +225,7 @@ impl BorshDeserialize for std::net::Ipv4Addr {
     #[inline]
     fn deserialize<R: Read>(reader: &mut R) -> Result<Self, Error> {
         let mut buf = [0u8; 4];
-        reader.read(&mut buf)?;
+        reader.read_exact(&mut buf)?;
         Ok(std::net::Ipv4Addr::from(buf))
     }
 }
@@ -235,7 +235,7 @@ impl BorshDeserialize for std::net::Ipv6Addr {
     #[inline]
     fn deserialize<R: Read>(reader: &mut R) -> Result<Self, Error> {
         let mut buf = [0u8; 16];
-        reader.read(&mut buf)?;
+        reader.read_exact(&mut buf)?;
         Ok(std::net::Ipv6Addr::from(buf))
     }
 }
@@ -244,7 +244,7 @@ impl BorshDeserialize for Box<[u8]> {
     fn deserialize<R: Read>(reader: &mut R) -> Result<Self, Error> {
         let len = u32::deserialize(reader)?;
         let mut res = vec![0; len as usize];
-        reader.read(&mut res)?;
+        reader.read_exact(&mut res)?;
         Ok(res.into_boxed_slice())
     }
 }

diff --git a/borsh-rs/borsh/src/ser/mod.rs b/borsh-rs/borsh/src/ser/mod.rs
@@ -18,7 +18,7 @@ pub trait BorshSerialize {
 impl BorshSerialize for u8 {
     #[inline]
     fn serialize<W: Write>(&self, writer: &mut W) -> Result<(), Error> {
-        writer.write(std::slice::from_ref(self)).map(|_| ())
+        writer.write_all(std::slice::from_ref(self))
     }
 }
 
@@ -27,7 +27,7 @@ macro_rules! impl_for_integer {
         impl BorshSerialize for $type {
             #[inline]
             fn serialize<W: Write>(&self, writer: &mut W) -> Result<(), Error> {
-                writer.write(&self.to_le_bytes()).map(|_| ())
+                writer.write_all(&self.to_le_bytes())
             }
         }
     };
@@ -56,7 +56,7 @@ macro_rules! impl_for_float {
                     !self.is_nan(),
                     "For portability reasons we do not allow to serialize NaNs."
                 );
-                writer.write(&self.to_bits().to_le_bytes()).map(|_| ())
+                writer.write_all(&self.to_bits().to_le_bytes())
             }
         }
     };
@@ -91,8 +91,8 @@ where
 impl BorshSerialize for String {
     #[inline]
     fn serialize<W: Write>(&self, writer: &mut W) -> Result<(), Error> {
-        writer.write(&(self.len() as u32).to_le_bytes())?;
-        writer.write(self.as_bytes())?;
+        writer.write_all(&(self.len() as u32).to_le_bytes())?;
+        writer.write_all(self.as_bytes())?;
         Ok(())
     }
 }
@@ -104,7 +104,7 @@ where
 {
     #[inline]
     fn serialize<W: Write>(&self, writer: &mut W) -> Result<(), Error> {
-        writer.write(&(self.len() as u32).to_le_bytes())?;
+        writer.write_all(&(self.len() as u32).to_le_bytes())?;
         for item in self {
             item.serialize(writer)?;
         }
@@ -204,22 +204,22 @@ impl BorshSerialize for std::net::SocketAddrV6 {
 impl BorshSerialize for std::net::Ipv4Addr {
     #[inline]
     fn serialize<W: Write>(&self, writer: &mut W) -> Result<(), Error> {
-        writer.write(&self.octets()).map(|_| ())
+        writer.write_all(&self.octets())
     }
 }
 
 #[cfg(feature = "std")]
 impl BorshSerialize for std::net::Ipv6Addr {
     #[inline]
     fn serialize<W: Write>(&self, writer: &mut W) -> Result<(), Error> {
-        writer.write(&self.octets()).map(|_| ())
+        writer.write_all(&self.octets())
     }
 }
 
 impl BorshSerialize for Box<[u8]> {
     fn serialize<W: Write>(&self, writer: &mut W) -> Result<(), Error> {
         (self.len() as u32).serialize(writer)?;
-        writer.write(self).map(|_| ())
+        writer.write_all(self)
     }
 }