Improved ObjectId displaying and fixed its Bson display

Author: netvl

src/bson.rs

@@ -90,16 +90,7 @@ impl Display for Bson {
                 format!("Timestamp({}, {})", time, inc)
             }
             &Bson::Binary(t, ref vec) => format!("BinData({}, 0x{})", u8::from(t), vec.to_hex()),
-            &Bson::ObjectId(ref id) => {
-                let mut vec = vec![];
-
-                for byte in id.bytes().iter() {
-                    vec.push(byte.to_owned());
-                }
-
-                let string = unsafe { String::from_utf8_unchecked(vec) };
-                format!("ObjectId(\"{}\")", string)
-            }
+            &Bson::ObjectId(ref id) => format!("ObjectId(\"{}\")", id),
             &Bson::UtcDatetime(date_time) => format!("Date(\"{}\")", date_time)
         };
 

src/oid.rs

@@ -146,11 +146,6 @@ impl ObjectId {
         self.id
     }
 
-    /// Returns a 12-byte (24-char) hexadecimal string
-    pub fn to_string(&self) -> String {
-        self.id.to_hex()
-    }
-
     /// Retrieves the timestamp (seconds since epoch) from an ObjectId.
     pub fn timestamp(&self) -> u32 {
         BigEndian::read_u32(&self.id)
@@ -271,6 +266,18 @@ impl ObjectId {
     }
 }
 
+impl ToHex for ObjectId {
+    fn to_hex(&self) -> String {
+        self.id.to_hex()
+    }
+}
+
+impl fmt::Display for ObjectId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str(&self.to_hex())
+    }
+}
+
 impl Decodable for ObjectId {
     fn decode<D: Decoder>(d: &mut D) -> result::Result<Self, D::Error> {
         let str = try!(d.read_str());

tests/lib.rs

@@ -45,7 +45,7 @@ fn test_format() {
         "date" => (Bson::UtcDatetime(date))
     };
 
-    let expected = format!("{{ float: 2.4, string: \"hello\", array: [\"testing\", 1], doc: {{ fish: \"in\", a: \"barrel\", !: 1 }}, bool: true, null: null, regexp: /s[ao]d/i, code: function(x) {{ return x._id; }}, i32: 12, i64: -55, timestamp: Timestamp(0, 229999444), binary: BinData(5, 0x{}), _id: ObjectId(\"{}\"), date: Date(\"{}\") }}", "thingies".as_bytes().to_hex(), id_string, date);
+    let expected = format!("{{ float: 2.4, string: \"hello\", array: [\"testing\", 1], doc: {{ fish: \"in\", a: \"barrel\", !: 1 }}, bool: true, null: null, regexp: /s[ao]d/i, code: function(x) {{ return x._id; }}, i32: 12, i64: -55, timestamp: Timestamp(0, 229999444), binary: BinData(5, 0x{}), _id: ObjectId(\"{}\"), date: Date(\"{}\") }}", "thingies".as_bytes().to_hex(), id_string.as_bytes().to_hex(), date);
 
     assert_eq!(expected, format!("{}", doc));
 }