Skip to content

Commit a7cc173

Browse files
committed
Stop using deprecated serde_if_integer128! macro
1 parent da00c19 commit a7cc173

File tree

1 file changed

+14
-27
lines changed

1 file changed

+14
-27
lines changed

src/maxminddb/decoder.rs

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use log::debug;
22
use serde::de::{self, DeserializeSeed, MapAccess, SeqAccess, Visitor};
33
use serde::forward_to_deserialize_any;
4-
use serde::serde_if_integer128;
54
use std::convert::TryInto;
65

76
use super::MaxMindDbError;
@@ -125,14 +124,7 @@ impl<'de> Decoder<'de> {
125124
7 => self.decode_map(size),
126125
8 => Value::I32(self.decode_int(size)?),
127126
9 => Value::U64(self.decode_uint64(size)?),
128-
10 => {
129-
serde_if_integer128! {
130-
return Ok(Value::U128(self.decode_uint128(size)?));
131-
}
132-
133-
#[allow(unreachable_code)]
134-
Value::Bytes(self.decode_bytes(size)?)
135-
}
127+
10 => Value::U128(self.decode_uint128(size)?),
136128
11 => self.decode_array(size),
137129
14 => Value::Bool(self.decode_bool(size)?),
138130
15 => Value::F32(self.decode_float(size)?),
@@ -215,25 +207,20 @@ impl<'de> Decoder<'de> {
215207
}
216208
}
217209

218-
serde_if_integer128! {
219-
fn decode_uint128(
220-
&mut self,
221-
size: usize,
222-
) -> DecodeResult<u128> {
223-
match size {
224-
s if s <= 16 => {
225-
let new_offset = self.current_ptr + size;
226-
227-
let value = self.buf[self.current_ptr..new_offset]
228-
.iter()
229-
.fold(0_u128, |acc, &b| (acc << 8) | u128::from(b));
230-
self.current_ptr = new_offset;
231-
Ok(value)
232-
}
233-
s => Err(MaxMindDbError::InvalidDatabase(format!(
234-
"u128 of size {s:?}"
235-
))),
210+
fn decode_uint128(&mut self, size: usize) -> DecodeResult<u128> {
211+
match size {
212+
s if s <= 16 => {
213+
let new_offset = self.current_ptr + size;
214+
215+
let value = self.buf[self.current_ptr..new_offset]
216+
.iter()
217+
.fold(0_u128, |acc, &b| (acc << 8) | u128::from(b));
218+
self.current_ptr = new_offset;
219+
Ok(value)
236220
}
221+
s => Err(MaxMindDbError::InvalidDatabase(format!(
222+
"u128 of size {s:?}"
223+
))),
237224
}
238225
}
239226

0 commit comments

Comments
 (0)