Skip to content

Commit 1c37bb1

Browse files
committed
serde_utils: remove old hex module
Despite the generic FromHex/ToHex traits being thrown around here, these are exclusively used for byte vectors and so we can just replace the generic calls with hex::decode_to_vec.
1 parent de8927c commit 1c37bb1

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/serde_utils.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ pub mod btreemap_byte_values {
77
// NOTE: This module can be exactly copied to use with HashMap.
88

99
use ::std::collections::BTreeMap;
10-
use crate::hex::{FromHex, ToHex};
10+
use hex_conservative as hex;
11+
use hex_conservative::DisplayHex as _;
1112
use serde;
1213

1314
pub fn serialize<S, T>(v: &BTreeMap<T, Vec<u8>>, s: S)
@@ -21,7 +22,7 @@ pub mod btreemap_byte_values {
2122
if s.is_human_readable() {
2223
let mut map = s.serialize_map(Some(v.len()))?;
2324
for (key, value) in v {
24-
map.serialize_entry(key, &value.to_hex())?;
25+
map.serialize_entry(key, &value.to_lower_hex_string())?;
2526
}
2627
map.end()
2728
} else {
@@ -51,7 +52,7 @@ pub mod btreemap_byte_values {
5152
{
5253
let mut ret = BTreeMap::new();
5354
while let Some((key, value)) = a.next_entry()? {
54-
ret.insert(key, FromHex::from_hex(value).map_err(serde::de::Error::custom)?);
55+
ret.insert(key, hex::decode_to_vec(value).map_err(serde::de::Error::custom)?);
5556
}
5657
Ok(ret)
5758
}

0 commit comments

Comments
 (0)