Skip to content
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

Correctly forward number of methods to the originals in Compact / Readable wrappers #35

Merged
merged 8 commits into from
Aug 5, 2024
Merged

Correctly forward number of methods to the originals in Compact / Readable wrappers #35

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d39e74a
Correctly forward deserialize_i128 / deserialize_u128 to the original…
Mingun Jul 28, 2024
c758d36
Correctly forward serialize_i128 / serialize_u128 to the original ser…
Mingun Jul 28, 2024
82f2796
Correctly forward visit_i128 / visit_u128 to the original visitor in …
Mingun Jul 28, 2024
1320028
Correctly wrap key in SerializeMap::serialize_entry
Mingun Jul 28, 2024
d63de9e
Correctly wrap deserializer for `deserialize_in_place` method
Mingun Jul 28, 2024
dbb1fa9
Correctly forward Serializer::collect_seq and collect_map methods
Mingun Jul 28, 2024
d281193
Correctly forward skip_field and collect_str to the originals
Mingun Jul 28, 2024
ac836f7
Correctly forward __private_visit_untagged_option to the original wit…
Mingun Jul 28, 2024
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
77 changes: 76 additions & 1 deletion src/configure.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,13 @@ where
{
T::deserialize(Readable(deserializer)).map(Readable)
}

fn deserialize_in_place<D>(deserializer: D, place: &mut Self) -> Result<(), D::Error>
where
D: Deserializer<'de>,
{
T::deserialize_in_place(Readable(deserializer), &mut place.0)
}
}
impl<'de, T> Deserialize<'de> for Compact<T>
where
Expand All @@ -133,6 +140,13 @@ where
{
T::deserialize(Compact(deserializer)).map(Compact)
}

fn deserialize_in_place<D>(deserializer: D, place: &mut Self) -> Result<(), D::Error>
where
D: Deserializer<'de>,
{
T::deserialize_in_place(Compact(deserializer), &mut place.0)
}
}

impl<'de, T> DeserializeSeed<'de> for Readable<T>
Expand Down Expand Up @@ -205,10 +219,12 @@ macro_rules! impl_serializer {
serialize_i16 i16,
serialize_i32 i32,
serialize_i64 i64,
serialize_i128 i128,
serialize_u8 u8,
serialize_u16 u16,
serialize_u32 u32,
serialize_u64 u64,
serialize_u128 u128,
serialize_f32 f32,
serialize_f64 f64,
serialize_char char,
Expand Down Expand Up @@ -318,6 +334,34 @@ macro_rules! impl_serializer {
.serialize_struct_variant(name, variant_index, variant, len)
.map($wrapper)
}

fn collect_seq<I>(self, iter: I) -> Result<Self::Ok, Self::Error>
where
I: IntoIterator,
<I as IntoIterator>::Item: Serialize,
{
self.0
.collect_seq(iter.into_iter().map(|item| $wrapper(item)))
}

fn collect_map<K, V, I>(self, iter: I) -> Result<Self::Ok, Self::Error>
where
K: Serialize,
V: Serialize,
I: IntoIterator<Item = (K, V)>,
{
self.0.collect_map(
iter.into_iter()
.map(|(key, value)| ($wrapper(key), $wrapper(value))),
)
}

fn collect_str<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
where
T: fmt::Display,
{
self.0.collect_str(value)
}
}

impl<S> SerializeSeq for $wrapper<S>
Expand Down Expand Up @@ -411,7 +455,7 @@ macro_rules! impl_serializer {
K: ?Sized + Serialize,
V: ?Sized + Serialize,
{
self.0.serialize_entry(key, &$wrapper(value))
self.0.serialize_entry(&$wrapper(key), &$wrapper(value))
}
fn end(self) -> Result<S::Ok, S::Error> {
self.0.end()
Expand All @@ -430,6 +474,9 @@ macro_rules! impl_serializer {
{
self.0.serialize_field(name, &$wrapper(field))
}
fn skip_field(&mut self, key: &'static str) -> Result<(), Self::Error> {
self.0.skip_field(key)
}
fn end(self) -> Result<S::Ok, S::Error> {
self.0.end()
}
Expand All @@ -447,6 +494,9 @@ macro_rules! impl_serializer {
{
self.0.serialize_field(name, &$wrapper(field))
}
fn skip_field(&mut self, key: &'static str) -> Result<(), Self::Error> {
self.0.skip_field(key)
}
fn end(self) -> Result<S::Ok, S::Error> {
self.0.end()
}
Expand Down Expand Up @@ -486,10 +536,12 @@ macro_rules! impl_deserializer {
deserialize_u16,
deserialize_u32,
deserialize_u64,
deserialize_u128,
deserialize_i8,
deserialize_i16,
deserialize_i32,
deserialize_i64,
deserialize_i128,
deserialize_f32,
deserialize_f64,
deserialize_char,
Expand Down Expand Up @@ -610,6 +662,12 @@ macro_rules! impl_deserializer {
{
self.0.visit_i64(v)
}
fn visit_i128<E>(self, v: i128) -> Result<D::Value, E>
where
E: Error,
{
self.0.visit_i128(v)
}
fn visit_u8<E>(self, v: u8) -> Result<D::Value, E>
where
E: Error,
Expand All @@ -634,6 +692,12 @@ macro_rules! impl_deserializer {
{
self.0.visit_u64(v)
}
fn visit_u128<E>(self, v: u128) -> Result<D::Value, E>
where
E: Error,
{
self.0.visit_u128(v)
}
fn visit_f32<E>(self, v: f32) -> Result<D::Value, E>
where
E: Error,
Expand Down Expand Up @@ -730,6 +794,17 @@ macro_rules! impl_deserializer {
{
self.0.visit_enum($wrapper(data))
}

fn __private_visit_untagged_option<D2>(
self,
deserializer: D2,
) -> Result<Self::Value, ()>
where
D2: Deserializer<'de>,
{
self.0
.__private_visit_untagged_option($wrapper(deserializer))
}
}

impl<'de, D> SeqAccess<'de> for $wrapper<D>
Expand Down
Loading