From ed4e39548ecf5a2ed32ad3be2ae74350bb677174 Mon Sep 17 00:00:00 2001 From: Za Wilcox Date: Tue, 20 Nov 2018 17:13:16 -0700 Subject: [PATCH] simplify trait bounds as Read/Write-BytesExt --- zcash_primitives/src/serialize.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zcash_primitives/src/serialize.rs b/zcash_primitives/src/serialize.rs index f1429438ef..3f1c5d710f 100644 --- a/zcash_primitives/src/serialize.rs +++ b/zcash_primitives/src/serialize.rs @@ -1,12 +1,12 @@ use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt}; -use std::io::{self, Read, Write}; +use std::io; const MAX_SIZE: usize = 0x02000000; struct CompactSize; impl CompactSize { - fn read(mut reader: R) -> io::Result { + fn read(mut reader: R) -> io::Result { let flag = reader.read_u8()?; match if flag < 253 { Ok(flag as usize) @@ -43,7 +43,7 @@ impl CompactSize { } } - fn write(mut writer: W, size: usize) -> io::Result<()> { + fn write(mut writer: W, size: usize) -> io::Result<()> { match size { s if s < 253 => writer.write_u8(s as u8), s if s <= 0xFFFF => { @@ -65,7 +65,7 @@ impl CompactSize { pub struct Vector; impl Vector { - pub fn read(mut reader: R, func: F) -> io::Result> + pub fn read(mut reader: R, func: F) -> io::Result> where F: Fn(&mut R) -> io::Result, { @@ -73,7 +73,7 @@ impl Vector { (0..count).into_iter().map(|_| func(&mut reader)).collect() } - pub fn write(mut writer: W, vec: &[E], func: F) -> io::Result<()> + pub fn write(mut writer: W, vec: &[E], func: F) -> io::Result<()> where F: Fn(&mut W, &E) -> io::Result<()>, {