Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/encoder/serde.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use serde::ser::{Serialize, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple,
SerializeTupleStruct, SerializeTupleVariant, Serializer};

use bson::{Array, Bson, Document, UtcDateTime};
use bson::{Array, Bson, Document, UtcDateTime, TimeStamp};
use oid::ObjectId;
use try_from::TryFrom;

Expand Down Expand Up @@ -435,6 +435,17 @@ impl SerializeStructVariant for StructVariantSerializer {
}
}

impl Serialize for TimeStamp {
#[inline]
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where S: Serializer
{
let ts = ((self.t.to_le() as u64) << 32) | (self.i.to_le() as u64);
let doc = Bson::TimeStamp(ts as i64);
doc.serialize(serializer)
}
}

impl Serialize for UtcDateTime {
#[inline]
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
Expand Down
18 changes: 18 additions & 0 deletions tests/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,24 @@ fn test_de_map() {
assert_eq!(expected, map);
}

#[test]
fn test_ser_timestamp() {
use bson::TimeStamp;

#[derive(Serialize, Deserialize, Eq, PartialEq, Debug)]
struct Foo {
ts: TimeStamp,
}

let foo = Foo { ts: TimeStamp { t: 12, i: 10 } };

let x = bson::to_bson(&foo).unwrap();
assert_eq!(x.as_document().unwrap(), &doc! { "ts": Bson::TimeStamp(0x0000_000C_0000_000A) });

let xfoo: Foo = bson::from_bson(x).unwrap();
assert_eq!(xfoo, foo);
}

#[test]
fn test_de_timestamp() {
use bson::TimeStamp;
Expand Down