Skip to content

simplify trait bounds as Read/Write-BytesExt #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zancas wants to merge 1 commit into from
Closed

simplify trait bounds as Read/Write-BytesExt #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions zcash_primitives/src/serialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<R: Read>(mut reader: R) -> io::Result<usize> {
fn read<R: ReadBytesExt>(mut reader: R) -> io::Result<usize> {
let flag = reader.read_u8()?;
match if flag < 253 {
Ok(flag as usize)
Expand Down Expand Up @@ -43,7 +43,7 @@ impl CompactSize {
}
}

fn write<W: Write>(mut writer: W, size: usize) -> io::Result<()> {
fn write<W: WriteBytesExt>(mut writer: W, size: usize) -> io::Result<()> {
match size {
s if s < 253 => writer.write_u8(s as u8),
s if s <= 0xFFFF => {
Expand All @@ -65,15 +65,15 @@ impl CompactSize {
pub struct Vector;

impl Vector {
pub fn read<R: Read, E, F>(mut reader: R, func: F) -> io::Result<Vec<E>>
pub fn read<R: ReadBytesExt, E, F>(mut reader: R, func: F) -> io::Result<Vec<E>>
where
F: Fn(&mut R) -> io::Result<E>,
{
let count = CompactSize::read(&mut reader)?;
(0..count).into_iter().map(|_| func(&mut reader)).collect()
}

pub fn write<W: Write, E, F>(mut writer: W, vec: &[E], func: F) -> io::Result<()>
pub fn write<W: WriteBytesExt, E, F>(mut writer: W, vec: &[E], func: F) -> io::Result<()>
where
F: Fn(&mut W, &E) -> io::Result<()>,
{
Expand Down