-
Notifications
You must be signed in to change notification settings - Fork 9
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.
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
Introduce more serde utils #92
Closed
Closed
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -106,3 +106,304 @@ where | |
d.deserialize_map(HexVisitor(PhantomData)) | ||
} | ||
} | ||
|
||
pub(crate) struct SerializeBytesAsHex<'a>(pub(crate) &'a [u8]); | ||
|
||
impl<'a> serde::Serialize for SerializeBytesAsHex<'a> { | ||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> | ||
where | ||
S: serde::Serializer, | ||
{ | ||
use crate::DisplayHex; | ||
|
||
serializer.collect_str(&format_args!("{:x}", self.0.as_hex())) | ||
} | ||
} | ||
|
||
#[cfg(feature = "alloc")] | ||
pub mod btreemap_byte_values { | ||
//! Module for serialization of BTreeMaps with hex byte values. | ||
#![allow(missing_docs)] | ||
|
||
// NOTE: This module can be exactly copied to use with HashMap. | ||
|
||
use crate::alloc::collections::BTreeMap; | ||
#[cfg(all(feature = "alloc", not(feature = "std")))] | ||
use crate::alloc::vec::Vec; | ||
use crate::FromHex; | ||
|
||
pub fn serialize<S, T>(v: &BTreeMap<T, Vec<u8>>, s: S) -> Result<S::Ok, S::Error> | ||
where | ||
S: serde::Serializer, | ||
T: serde::Serialize + core::hash::Hash + Eq + Ord, | ||
{ | ||
use serde::ser::SerializeMap; | ||
|
||
// Don't do anything special when not human readable. | ||
if !s.is_human_readable() { | ||
serde::Serialize::serialize(v, s) | ||
} else { | ||
let mut map = s.serialize_map(Some(v.len()))?; | ||
for (key, value) in v.iter() { | ||
map.serialize_entry(key, &super::SerializeBytesAsHex(value))?; | ||
} | ||
map.end() | ||
} | ||
} | ||
|
||
pub fn deserialize<'de, D, T>(d: D) -> Result<BTreeMap<T, Vec<u8>>, D::Error> | ||
where | ||
D: serde::Deserializer<'de>, | ||
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord, | ||
{ | ||
use core::marker::PhantomData; | ||
|
||
struct Visitor<T>(PhantomData<T>); | ||
impl<'de, T> serde::de::Visitor<'de> for Visitor<T> | ||
where | ||
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord, | ||
{ | ||
type Value = BTreeMap<T, Vec<u8>>; | ||
|
||
fn expecting(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result { | ||
write!(f, "a map with hexadecimal values") | ||
} | ||
|
||
fn visit_map<A: serde::de::MapAccess<'de>>( | ||
self, | ||
mut a: A, | ||
) -> Result<Self::Value, A::Error> { | ||
let mut ret = BTreeMap::new(); | ||
while let Some((key, value)) = a.next_entry()? { | ||
ret.insert(key, FromHex::from_hex(value).map_err(serde::de::Error::custom)?); | ||
} | ||
Ok(ret) | ||
} | ||
} | ||
|
||
// Don't do anything special when not human readable. | ||
if !d.is_human_readable() { | ||
serde::Deserialize::deserialize(d) | ||
} else { | ||
d.deserialize_map(Visitor(PhantomData)) | ||
} | ||
} | ||
} | ||
|
||
#[cfg(feature = "alloc")] | ||
pub mod btreemap_as_seq { | ||
//! Module for serialization of BTreeMaps as lists of sequences because | ||
//! serde_json will not serialize hashmaps with non-string keys be default. | ||
#![allow(missing_docs)] | ||
|
||
// NOTE: This module can be exactly copied to use with HashMap. | ||
|
||
use alloc::collections::BTreeMap; | ||
|
||
pub fn serialize<S, T, U>(v: &BTreeMap<T, U>, s: S) -> Result<S::Ok, S::Error> | ||
where | ||
S: serde::Serializer, | ||
T: serde::Serialize + core::hash::Hash + Eq + Ord, | ||
U: serde::Serialize, | ||
{ | ||
use serde::ser::SerializeSeq; | ||
|
||
// Don't do anything special when not human readable. | ||
if !s.is_human_readable() { | ||
serde::Serialize::serialize(v, s) | ||
} else { | ||
let mut seq = s.serialize_seq(Some(v.len()))?; | ||
for pair in v.iter() { | ||
seq.serialize_element(&pair)?; | ||
} | ||
seq.end() | ||
} | ||
} | ||
|
||
pub fn deserialize<'de, D, T, U>(d: D) -> Result<BTreeMap<T, U>, D::Error> | ||
where | ||
D: serde::Deserializer<'de>, | ||
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord, | ||
U: serde::Deserialize<'de>, | ||
{ | ||
use core::marker::PhantomData; | ||
|
||
struct Visitor<T, U>(PhantomData<(T, U)>); | ||
impl<'de, T, U> serde::de::Visitor<'de> for Visitor<T, U> | ||
where | ||
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord, | ||
U: serde::Deserialize<'de>, | ||
{ | ||
type Value = BTreeMap<T, U>; | ||
|
||
fn expecting(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result { | ||
write!(f, "a sequence of pairs") | ||
} | ||
|
||
fn visit_seq<A: serde::de::SeqAccess<'de>>( | ||
self, | ||
mut a: A, | ||
) -> Result<Self::Value, A::Error> { | ||
let mut ret = BTreeMap::new(); | ||
while let Some((key, value)) = a.next_element()? { | ||
ret.insert(key, value); | ||
} | ||
Ok(ret) | ||
} | ||
} | ||
|
||
// Don't do anything special when not human readable. | ||
if !d.is_human_readable() { | ||
serde::Deserialize::deserialize(d) | ||
} else { | ||
d.deserialize_seq(Visitor(PhantomData)) | ||
} | ||
} | ||
} | ||
|
||
#[cfg(feature = "alloc")] | ||
pub mod btreemap_as_seq_byte_values { | ||
//! Module for serialization of BTreeMaps as lists of sequences because | ||
//! serde_json will not serialize hashmaps with non-string keys be default. | ||
#![allow(missing_docs)] | ||
|
||
// NOTE: This module can be exactly copied to use with HashMap. | ||
|
||
use serde::{Deserialize, Serialize}; | ||
|
||
use crate::alloc::collections::BTreeMap; | ||
#[cfg(all(feature = "alloc", not(feature = "std")))] | ||
use crate::alloc::vec::Vec; | ||
|
||
/// A custom key-value pair type that serialized the bytes as hex. | ||
#[derive(Debug, Deserialize)] | ||
struct OwnedPair<T>( | ||
T, | ||
#[serde(deserialize_with = "crate::serde::hex_bytes::deserialize")] Vec<u8>, | ||
); | ||
|
||
/// A custom key-value pair type that serialized the bytes as hex. | ||
#[derive(Debug, Serialize)] | ||
struct BorrowedPair<'a, T: 'static>( | ||
&'a T, | ||
#[serde(serialize_with = "crate::serde::hex_bytes::serialize")] &'a [u8], | ||
); | ||
|
||
pub fn serialize<S, T>(v: &BTreeMap<T, Vec<u8>>, s: S) -> Result<S::Ok, S::Error> | ||
where | ||
S: serde::Serializer, | ||
T: serde::Serialize + core::hash::Hash + Eq + Ord + 'static, | ||
{ | ||
use serde::ser::SerializeSeq; | ||
|
||
// Don't do anything special when not human readable. | ||
if !s.is_human_readable() { | ||
serde::Serialize::serialize(v, s) | ||
} else { | ||
let mut seq = s.serialize_seq(Some(v.len()))?; | ||
for (key, value) in v.iter() { | ||
seq.serialize_element(&BorrowedPair(key, value))?; | ||
} | ||
seq.end() | ||
} | ||
} | ||
|
||
pub fn deserialize<'de, D, T>(d: D) -> Result<BTreeMap<T, Vec<u8>>, D::Error> | ||
where | ||
D: serde::Deserializer<'de>, | ||
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord, | ||
{ | ||
use core::marker::PhantomData; | ||
|
||
struct Visitor<T>(PhantomData<T>); | ||
impl<'de, T> serde::de::Visitor<'de> for Visitor<T> | ||
where | ||
T: serde::Deserialize<'de> + core::hash::Hash + Eq + Ord, | ||
{ | ||
type Value = BTreeMap<T, Vec<u8>>; | ||
|
||
fn expecting(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result { | ||
write!(f, "a sequence of pairs") | ||
} | ||
|
||
fn visit_seq<A: serde::de::SeqAccess<'de>>( | ||
self, | ||
mut a: A, | ||
) -> Result<Self::Value, A::Error> { | ||
let mut ret = BTreeMap::new(); | ||
while let Option::Some(OwnedPair(key, value)) = a.next_element()? { | ||
ret.insert(key, value); | ||
} | ||
Ok(ret) | ||
} | ||
} | ||
|
||
// Don't do anything special when not human readable. | ||
if !d.is_human_readable() { | ||
serde::Deserialize::deserialize(d) | ||
} else { | ||
d.deserialize_seq(Visitor(PhantomData)) | ||
} | ||
} | ||
} | ||
|
||
mod hex_bytes { | ||
//! Module for serialization of byte arrays as hex strings. | ||
#![allow(missing_docs)] | ||
|
||
use crate::FromHex; | ||
|
||
pub fn serialize<T, S>(bytes: &T, s: S) -> Result<S::Ok, S::Error> | ||
where | ||
T: serde::Serialize + AsRef<[u8]>, | ||
S: serde::Serializer, | ||
{ | ||
// Don't do anything special when not human readable. | ||
if !s.is_human_readable() { | ||
serde::Serialize::serialize(bytes, s) | ||
} else { | ||
serde::Serialize::serialize(&super::SerializeBytesAsHex(bytes.as_ref()), s) | ||
} | ||
} | ||
|
||
pub fn deserialize<'de, D, B>(d: D) -> Result<B, D::Error> | ||
where | ||
D: serde::Deserializer<'de>, | ||
B: serde::Deserialize<'de> + FromHex, | ||
{ | ||
struct Visitor<B>(core::marker::PhantomData<B>); | ||
|
||
impl<'de, B: FromHex> serde::de::Visitor<'de> for Visitor<B> { | ||
type Value = B; | ||
|
||
fn expecting(&self, formatter: &mut core::fmt::Formatter) -> core::fmt::Result { | ||
formatter.write_str("an ASCII hex string") | ||
} | ||
|
||
fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E> | ||
where | ||
E: serde::de::Error, | ||
{ | ||
if let Ok(hex) = core::str::from_utf8(v) { | ||
FromHex::from_hex(hex).map_err(E::custom) | ||
} else { | ||
return Err(E::invalid_value(serde::de::Unexpected::Bytes(v), &self)); | ||
} | ||
} | ||
|
||
fn visit_str<E>(self, v: &str) -> Result<Self::Value, E> | ||
where | ||
E: serde::de::Error, | ||
{ | ||
FromHex::from_hex(v).map_err(E::custom) | ||
} | ||
} | ||
|
||
// Don't do anything special when not human readable. | ||
if !d.is_human_readable() { | ||
serde::Deserialize::deserialize(d) | ||
} else { | ||
d.deserialize_str(Visitor(core::marker::PhantomData)) | ||
} | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These btree map things are super-specific and I don't think they'll be shared by many crates. Even in |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this no longer needs
pub(crate)
.