Skip to content

Use Const Generics instead of array macro #21

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

Open
LeWimbes wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use Const Generics instead of array macro #21

Show file tree
Hide file tree
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
90 changes: 10 additions & 80 deletions msgpacker/src/pack/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,88 +51,18 @@ where
}
}

macro_rules! array {
($n:expr) => {
impl<X> Packable for [X; $n]
where
X: Packable,
{
fn pack<T>(&self, buf: &mut T) -> usize
where
T: Extend<u8>,
{
self.iter().map(|t| t.pack(buf)).sum()
}
}
};
impl<X, const N: usize> Packable for [X; N]
where
X: Packable,
{
fn pack<T>(&self, buf: &mut T) -> usize
where
T: Extend<u8>,
{
self.iter().map(|t| t.pack(buf)).sum()
}
}

array!(0);
array!(1);
array!(2);
array!(3);
array!(4);
array!(5);
array!(6);
array!(7);
array!(8);
array!(9);
array!(10);
array!(11);
array!(12);
array!(13);
array!(14);
array!(15);
array!(16);
array!(17);
array!(18);
array!(19);
array!(20);
array!(21);
array!(22);
array!(23);
array!(24);
array!(25);
array!(26);
array!(27);
array!(28);
array!(29);
array!(30);
array!(31);
array!(32);
array!(33);
array!(34);
array!(35);
array!(36);
array!(37);
array!(38);
array!(39);
array!(40);
array!(41);
array!(42);
array!(43);
array!(44);
array!(45);
array!(46);
array!(47);
array!(48);
array!(49);
array!(50);
array!(51);
array!(52);
array!(53);
array!(54);
array!(55);
array!(56);
array!(57);
array!(58);
array!(59);
array!(60);
array!(61);
array!(62);
array!(63);
array!(64);

macro_rules! tuple {
( $($name:ident)+) => (
impl<$($name,)+> Packable for ($($name,)+)
Expand Down
160 changes: 44 additions & 116 deletions msgpacker/src/unpack/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,126 +88,54 @@ where
}
}

macro_rules! array {
($n:expr) => {
impl<X> Unpackable for [X; $n]
where
X: Unpackable,
{
type Error = <X as Unpackable>::Error;
impl<X, const N: usize> Unpackable for [X; N]
where
X: Unpackable,
{
type Error = <X as Unpackable>::Error;

fn unpack(mut buf: &[u8]) -> Result<(usize, Self), Self::Error> {
let mut array = [const { MaybeUninit::uninit() }; $n];
let n =
array
.iter_mut()
.try_fold::<_, _, Result<_, Self::Error>>(0, |count, a| {
let (n, x) = X::unpack(buf)?;
buf = &buf[n..];
a.write(x);
Ok(count + n)
})?;
// Safety: array is initialized
let array = ::core::array::from_fn(|i| {
let mut x = MaybeUninit::zeroed();
::core::mem::swap(&mut array[i], &mut x);
unsafe { MaybeUninit::assume_init(x) }
});
Ok((n, array))
}
fn unpack(mut buf: &[u8]) -> Result<(usize, Self), Self::Error> {
let mut array = [const { MaybeUninit::uninit() }; N];
let n = array
.iter_mut()
.try_fold::<_, _, Result<_, Self::Error>>(0, |count, a| {
let (n, x) = X::unpack(buf)?;
buf = &buf[n..];
a.write(x);
Ok(count + n)
})?;
// Safety: array is initialized
let array = ::core::array::from_fn(|i| {
let mut x = MaybeUninit::zeroed();
::core::mem::swap(&mut array[i], &mut x);
unsafe { MaybeUninit::assume_init(x) }
});
Ok((n, array))
}

fn unpack_iter<I>(bytes: I) -> Result<(usize, Self), Self::Error>
where
I: IntoIterator<Item = u8>,
{
let mut bytes = bytes.into_iter();
let mut array = [const { MaybeUninit::uninit() }; $n];
let n =
array
.iter_mut()
.try_fold::<_, _, Result<_, Self::Error>>(0, |count, a| {
let (n, x) = X::unpack_iter(bytes.by_ref())?;
a.write(x);
Ok(count + n)
})?;
// Safety: array is initialized
let array = ::core::array::from_fn(|i| {
let mut x = MaybeUninit::zeroed();
::core::mem::swap(&mut array[i], &mut x);
unsafe { MaybeUninit::assume_init(x) }
});
Ok((n, array))
}
}
};
fn unpack_iter<I>(bytes: I) -> Result<(usize, Self), Self::Error>
where
I: IntoIterator<Item = u8>,
{
let mut bytes = bytes.into_iter();
let mut array = [const { MaybeUninit::uninit() }; N];
let n = array
.iter_mut()
.try_fold::<_, _, Result<_, Self::Error>>(0, |count, a| {
let (n, x) = X::unpack_iter(bytes.by_ref())?;
a.write(x);
Ok(count + n)
})?;
// Safety: array is initialized
let array = ::core::array::from_fn(|i| {
let mut x = MaybeUninit::zeroed();
::core::mem::swap(&mut array[i], &mut x);
unsafe { MaybeUninit::assume_init(x) }
});
Ok((n, array))
}
}

array!(0);
array!(1);
array!(2);
array!(3);
array!(4);
array!(5);
array!(6);
array!(7);
array!(8);
array!(9);
array!(10);
array!(11);
array!(12);
array!(13);
array!(14);
array!(15);
array!(16);
array!(17);
array!(18);
array!(19);
array!(20);
array!(21);
array!(22);
array!(23);
array!(24);
array!(25);
array!(26);
array!(27);
array!(28);
array!(29);
array!(30);
array!(31);
array!(32);
array!(33);
array!(34);
array!(35);
array!(36);
array!(37);
array!(38);
array!(39);
array!(40);
array!(41);
array!(42);
array!(43);
array!(44);
array!(45);
array!(46);
array!(47);
array!(48);
array!(49);
array!(50);
array!(51);
array!(52);
array!(53);
array!(54);
array!(55);
array!(56);
array!(57);
array!(58);
array!(59);
array!(60);
array!(61);
array!(62);
array!(63);
array!(64);

macro_rules! tuple {
($err:ident, $($name:ident)+) => (
impl<$($name,)+> Unpackable for ($($name,)+)
Expand Down