Skip to content

Commit

Permalink
add feature: key to lowercase
Browse files Browse the repository at this point in the history
Signed-off-by: tabVersion <tabvision@bupt.icu>
  • Loading branch information
tabVersion committed Jan 9, 2023
1 parent e611d9d commit fe89a0d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ value-no-dup-keys = []
# Support for 128 bit integers
128bit = ["value-trait/128bit"]

key-to-lowercase = []

# used for enabeling known keys in favour of a slower
# hasher that is not protected against hash collision
# attacks
Expand Down
15 changes: 10 additions & 5 deletions src/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ pub use value_trait::*;
pub fn deserialize<'de, Value, Key>(s: &'de mut [u8]) -> Result<Value>
where
Value: Builder<'de> + From<Vec<Value>> + From<HashMap<Key, Value>> + 'de,
Key: Hash + Eq + From<&'de str>,
Key: Hash + Eq + From<&'de str> + From<String>,
{
match Deserializer::from_slice(s) {
Ok(de) => Ok(ValueDeserializer::from_deserializer(de).parse()),
Expand All @@ -94,7 +94,7 @@ where
struct ValueDeserializer<'de, Value, Key>
where
Value: Builder<'de> + From<Vec<Value>> + From<HashMap<Key, Value>> + 'de,
Key: Hash + Eq + From<&'de str>,
Key: Hash + Eq + From<&'de str> + From<String>,
{
de: Deserializer<'de>,
_marker: PhantomData<(Value, Key)>,
Expand All @@ -103,7 +103,7 @@ where
impl<'de, Value, Key> ValueDeserializer<'de, Value, Key>
where
Value: Builder<'de> + From<&'de str> + From<Vec<Value>> + From<HashMap<Key, Value>> + 'de,
Key: Hash + Eq + From<&'de str>,
Key: Hash + Eq + From<&'de str> + From<String>,
{
pub fn from_deserializer(de: Deserializer<'de>) -> Self {
Self {
Expand Down Expand Up @@ -146,10 +146,15 @@ where
// element so we eat this
for _ in 0..len {
if let Node::String(key) = unsafe { self.de.next_() } {
#[cfg(feature = "key-to-lowercase")]
let k = Key::from(key.to_ascii_lowercase());
#[cfg(not(feature = "key-to-lowercase"))]
let k = Key::from(key);

#[cfg(not(feature = "value-no-dup-keys"))]
res.insert_nocheck(key.into(), self.parse());
res.insert_nocheck(k, self.parse());
#[cfg(feature = "value-no-dup-keys")]
res.insert(key.into(), self.parse());
res.insert(k, self.parse());
} else {
unreachable!();
}
Expand Down
9 changes: 7 additions & 2 deletions src/value/owned.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,15 @@ impl<'de> OwnedDeserializer<'de> {

for _ in 0..len {
if let Node::String(key) = unsafe { self.de.next_() } {
#[cfg(feature = "key-to-lowercase")]
let k = key.to_ascii_lowercase();
#[cfg(not(feature = "key-to-lowercase"))]
let k = key.to_string();

#[cfg(not(feature = "value-no-dup-keys"))]
res.insert_nocheck(key.into(), self.parse());
res.insert_nocheck(k, self.parse());
#[cfg(feature = "value-no-dup-keys")]
res.insert(key.into(), self.parse());
res.insert(k, self.parse());
} else {
unreachable!();
}
Expand Down

0 comments on commit fe89a0d

Please sign in to comment.