Skip to content

Commit 717ad95

Browse files
add arc impl (#522)
* add arc impl * ci: trigger --------- Co-authored-by: Emmanuel Thompson <[email protected]>
1 parent 9b79468 commit 717ad95

File tree

2 files changed

+154
-0
lines changed

2 files changed

+154
-0
lines changed

src/impls/arc.rs

+151
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
use no_std_io::io::{Read, Seek, Write};
2+
use std::sync::Arc;
3+
4+
use alloc::vec::Vec;
5+
6+
use crate::ctx::Limit;
7+
use crate::reader::Reader;
8+
use crate::writer::Writer;
9+
use crate::{DekuError, DekuReader, DekuWriter};
10+
11+
impl<'a, T, Ctx> DekuReader<'a, Ctx> for Arc<T>
12+
where
13+
T: DekuReader<'a, Ctx>,
14+
Ctx: Copy,
15+
{
16+
fn from_reader_with_ctx<R: Read + Seek>(
17+
reader: &mut Reader<R>,
18+
inner_ctx: Ctx,
19+
) -> Result<Self, DekuError> {
20+
let val = <T>::from_reader_with_ctx(reader, inner_ctx)?;
21+
Ok(Arc::new(val))
22+
}
23+
}
24+
25+
impl<'a, T, Ctx, Predicate> DekuReader<'a, (Limit<T, Predicate>, Ctx)> for Arc<[T]>
26+
where
27+
T: DekuReader<'a, Ctx>,
28+
Ctx: Copy,
29+
Predicate: FnMut(&T) -> bool,
30+
{
31+
fn from_reader_with_ctx<R: Read + Seek>(
32+
reader: &mut Reader<R>,
33+
(limit, inner_ctx): (Limit<T, Predicate>, Ctx),
34+
) -> Result<Self, DekuError> {
35+
// use Vec<T>'s implementation and convert to Arc<[T]>
36+
let val = <Vec<T>>::from_reader_with_ctx(reader, (limit, inner_ctx))?;
37+
Ok(Arc::from(val.into_boxed_slice()))
38+
}
39+
}
40+
41+
impl<T, Ctx> DekuWriter<Ctx> for Arc<[T]>
42+
where
43+
T: DekuWriter<Ctx>,
44+
Ctx: Copy,
45+
{
46+
/// Write all `T`s to bits
47+
fn to_writer<W: Write + Seek>(
48+
&self,
49+
writer: &mut Writer<W>,
50+
ctx: Ctx,
51+
) -> Result<(), DekuError> {
52+
for v in self.as_ref() {
53+
v.to_writer(writer, ctx)?;
54+
}
55+
Ok(())
56+
}
57+
}
58+
59+
impl<T, Ctx> DekuWriter<Ctx> for Arc<T>
60+
where
61+
T: DekuWriter<Ctx>,
62+
Ctx: Copy,
63+
{
64+
/// Write all `T`s to bits
65+
fn to_writer<W: Write + Seek>(
66+
&self,
67+
writer: &mut Writer<W>,
68+
ctx: Ctx,
69+
) -> Result<(), DekuError> {
70+
self.as_ref().to_writer(writer, ctx)?;
71+
Ok(())
72+
}
73+
}
74+
75+
#[cfg(test)]
76+
mod tests {
77+
use no_std_io::io::Cursor;
78+
use rstest::rstest;
79+
80+
use super::*;
81+
use crate::ctx::*;
82+
use crate::native_endian;
83+
use crate::reader::Reader;
84+
#[cfg(feature = "bits")]
85+
use bitvec::prelude::*;
86+
87+
#[rstest(input, expected,
88+
case(
89+
&[0xEF, 0xBE],
90+
Arc::new(native_endian!(0xBEEF_u16)),
91+
),
92+
)]
93+
fn test_boxed(input: &[u8], expected: Arc<u16>) {
94+
let mut cursor = Cursor::new(input);
95+
let mut reader = Reader::new(&mut cursor);
96+
let res_read = <Arc<u16>>::from_reader_with_ctx(&mut reader, ()).unwrap();
97+
assert_eq!(expected, res_read);
98+
99+
let mut writer = Writer::new(Cursor::new(vec![]));
100+
res_read.to_writer(&mut writer, ()).unwrap();
101+
assert_eq!(input.to_vec(), writer.inner.into_inner());
102+
}
103+
104+
// Note: Copied tests from vec.rs impl
105+
#[cfg(feature = "bits")]
106+
#[rstest(input, endian, bit_size, limit, expected, expected_rest_bits, expected_rest_bytes, expected_write,
107+
case::normal_le([0xAA, 0xBB, 0xCC, 0xDD].as_ref(), Endian::Little, Some(16), 2.into(), Arc::from(vec![0xBBAA, 0xDDCC].into_boxed_slice()), bits![u8, Msb0;], &[], vec![0xAA, 0xBB, 0xCC, 0xDD]),
108+
case::normal_be([0xAA, 0xBB, 0xCC, 0xDD].as_ref(), Endian::Big, Some(16), 2.into(), Arc::from(vec![0xAABB, 0xCCDD].into_boxed_slice()), bits![u8, Msb0;], &[], vec![0xAA, 0xBB, 0xCC, 0xDD]),
109+
case::predicate_le([0xAA, 0xBB, 0xCC, 0xDD].as_ref(), Endian::Little, Some(16), (|v: &u16| *v == 0xBBAA).into(), Arc::from(vec![0xBBAA].into_boxed_slice()), bits![u8, Msb0;], &[0xcc, 0xdd], vec![0xAA, 0xBB]),
110+
case::predicate_be([0xAA, 0xBB, 0xCC, 0xDD].as_ref(), Endian::Big, Some(16), (|v: &u16| *v == 0xAABB).into(), Arc::from(vec![0xAABB].into_boxed_slice()), bits![u8, Msb0;], &[0xcc, 0xdd], vec![0xAA, 0xBB]),
111+
case::bytes_le([0xAA, 0xBB, 0xCC, 0xDD].as_ref(), Endian::Little, Some(16), BitSize(16).into(), Arc::from(vec![0xBBAA].into_boxed_slice()), bits![u8, Msb0;], &[0xcc, 0xdd], vec![0xAA, 0xBB]),
112+
case::bytes_be([0xAA, 0xBB, 0xCC, 0xDD].as_ref(), Endian::Big, Some(16), BitSize(16).into(), Arc::from(vec![0xAABB].into_boxed_slice()), bits![u8, Msb0;], &[0xcc, 0xdd], vec![0xAA, 0xBB]),
113+
)]
114+
fn test_boxed_slice_from_reader_with_ctx<Predicate: FnMut(&u16) -> bool>(
115+
input: &[u8],
116+
endian: Endian,
117+
bit_size: Option<usize>,
118+
limit: Limit<u16, Predicate>,
119+
expected: Arc<[u16]>,
120+
expected_rest_bits: &bitvec::slice::BitSlice<u8, bitvec::prelude::Msb0>,
121+
expected_rest_bytes: &[u8],
122+
expected_write: Vec<u8>,
123+
) {
124+
// Unwrap here because all test cases are `Some`.
125+
let bit_size = bit_size.unwrap();
126+
127+
let mut cursor = Cursor::new(input);
128+
let mut reader = Reader::new(&mut cursor);
129+
let res_read =
130+
<Arc<[u16]>>::from_reader_with_ctx(&mut reader, (limit, (endian, BitSize(bit_size))))
131+
.unwrap();
132+
assert_eq!(expected, res_read);
133+
assert_eq!(
134+
reader.rest(),
135+
expected_rest_bits.iter().by_vals().collect::<Vec<bool>>()
136+
);
137+
let mut buf = vec![];
138+
cursor.read_to_end(&mut buf).unwrap();
139+
assert_eq!(expected_rest_bytes, buf);
140+
141+
assert_eq!(input[..expected_write.len()].to_vec(), expected_write);
142+
143+
let mut writer = Writer::new(Cursor::new(vec![]));
144+
res_read
145+
.to_writer(&mut writer, (endian, BitSize(bit_size)))
146+
.unwrap();
147+
assert_eq!(expected_write, writer.inner.into_inner());
148+
149+
assert_eq!(input[..expected_write.len()].to_vec(), expected_write);
150+
}
151+
}

src/impls/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ mod tuple;
77
mod unit;
88
mod vec;
99

10+
#[cfg(feature = "std")]
11+
mod arc;
12+
1013
#[cfg(feature = "std")]
1114
mod cow;
1215

0 commit comments

Comments
 (0)