robin/bitbuffer
1
0
Fork 0
mirror of https://codeberg.org/icewind/bitbuffer.git synced 2026-06-03 16:44:06 +02:00
Code Issues Releases Wiki Activity

use macro for tuple implementations

Browse source
This commit is contained in:
Robin Appelman 2019-10-13 11:25:49 +02:00
commit 34411a7c80
1 changed files with 18 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/read.rs
View file

@ -266,54 +266,27 @@ impl<T: BitSize> BitSize for Box<T> {
} }
} }
impl<E: Endianness, T1: BitRead<E>, T2: BitRead<E>> BitRead<E> for (T1, T2) { macro_rules! impl_read_tuple {
($($type:ident),*) => {
impl<E: Endianness, $($type: BitRead<E>),*> BitRead<E> for ($($type),*) {
#[inline] #[inline]
fn read(stream: &mut BitStream<E>) -> Result<Self> { fn read(stream: &mut BitStream<E>) -> Result<Self> {
Ok((T1::read(stream)?, T2::read(stream)?)) Ok(($(<$type>::read(stream)?),*))
} }
}
impl<E: Endianness, T1: BitRead<E>, T2: BitRead<E>, T3: BitRead<E>> BitRead<E> for (T1, T2, T3) {
#[inline]
fn read(stream: &mut BitStream<E>) -> Result<Self> {
Ok((T1::read(stream)?, T2::read(stream)?, T3::read(stream)?))
} }
}
impl<E: Endianness, T1: BitRead<E>, T2: BitRead<E>, T3: BitRead<E>, T4: BitRead<E>> BitRead<E> impl<$($type: BitSize),*> BitSize for ($($type),*) {
for (T1, T2, T3, T4)
{
#[inline]
fn read(stream: &mut BitStream<E>) -> Result<Self> {
Ok((
T1::read(stream)?,
T2::read(stream)?,
T3::read(stream)?,
T4::read(stream)?,
))
}
}
impl<T1: BitSize, T2: BitSize> BitSize for (T1, T2) {
#[inline] #[inline]
fn bit_size() -> usize { fn bit_size() -> usize {
T1::bit_size() + T2::bit_size() $(<$type>::bit_size() + )* 0
} }
}
};
} }
impl<T1: BitSize, T2: BitSize, T3: BitSize> BitSize for (T1, T2, T3) { impl_read_tuple!(T1, T2);
#[inline] impl_read_tuple!(T1, T2, T3);
fn bit_size() -> usize { impl_read_tuple!(T1, T2, T3, T4);
T1::bit_size() + T2::bit_size() + T3::bit_size()
}
}
impl<T1: BitSize, T2: BitSize, T3: BitSize, T4: BitSize> BitSize for (T1, T2, T3, T4) {
#[inline]
fn bit_size() -> usize {
T1::bit_size() + T2::bit_size() + T3::bit_size() + T4::bit_size()
}
}
/// Trait for types that can be read from a stream, requiring the size to be configured /// Trait for types that can be read from a stream, requiring the size to be configured
/// ///