---

yaml
---
r: 145982
b: refs/heads/try2
c: 75cedf8
h: refs/heads/master
v: v3

Author: emberian

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 023466cccaf2230b6f2beb3e9e9802e6be1f29d9
+refs/heads/try2: 75cedf8e62a0c8d8bfd9e15d4a1d3b554eccbdc2
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/uuid.rs

@@ -488,14 +488,16 @@ impl TotalEq for Uuid {
     }
 }
 
-// FIXME #9845: Test these
+// FIXME #9845: Test these more thoroughly
 impl<T: Encoder> Encodable<T> for Uuid {
+    /// Encode a UUID as a hypenated string
     fn encode(&self, e: &mut T) {
         e.emit_str(self.to_hyphenated_str());
     }
 }
 
 impl<T: Decoder> Decodable<T> for Uuid {
+    /// Decode a UUID from a string
     fn decode(d: &mut T) -> Uuid {
         from_str(d.read_str()).unwrap()
     }
@@ -785,6 +787,20 @@ mod test {
         assert!(ub.len() == 16);
         assert!(! ub.iter().all(|&b| b == 0));
     }
+
+    #[test]
+    fn test_serialize_round_trip() {
+        use std;
+        use ebml;
+        use serialize::{Encodable, Decodable};
+
+        let u = Uuid::new_v4();
+        let bytes = do std::io::with_bytes_writer |wr| {
+            u.encode(&mut ebml::writer::Encoder(wr));
+        };
+        let u2 = Decodable::decode(&mut ebml::reader::Decoder(ebml::reader::Doc(@bytes)));
+        assert_eq!(u, u2);
+    }
 }
 
 #[cfg(test)]