Skip to content

Commit 3b34ff9

Browse files
RUST-1748 Convert unsigned serde helpers to use serde_conv (#575)
1 parent f14d6d1 commit 3b34ff9

File tree

3 files changed

+1052
-336
lines changed

3 files changed

+1052
-336
lines changed

src/extjson/models.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ use serde::{
66
de::{Error as _, Unexpected},
77
Deserialize,
88
Serialize,
9+
Serializer,
910
};
10-
use std::borrow::Cow;
11+
use std::{borrow::Cow, result::Result as StdResult};
1112

1213
use crate::{
1314
base64,
@@ -217,13 +218,18 @@ pub(crate) struct Timestamp {
217218
body: TimestampBody,
218219
}
219220

221+
/// Serializes a u32 as an i64.
222+
fn serialize_u32_as_i64<S: Serializer>(val: &u32, serializer: S) -> StdResult<S::Ok, S::Error> {
223+
serializer.serialize_i64(*val as i64)
224+
}
225+
220226
#[derive(Serialize, Deserialize, Debug)]
221227
#[serde(deny_unknown_fields)]
222228
pub(crate) struct TimestampBody {
223-
#[serde(serialize_with = "crate::serde_helpers::serialize_u32_as_i64")]
229+
#[serde(serialize_with = "serialize_u32_as_i64")]
224230
pub(crate) t: u32,
225231

226-
#[serde(serialize_with = "crate::serde_helpers::serialize_u32_as_i64")]
232+
#[serde(serialize_with = "serialize_u32_as_i64")]
227233
pub(crate) i: u32,
228234
}
229235

0 commit comments

Comments
 (0)