---

yaml
---
r: 82394
b: refs/heads/master
c: 256913e
h: refs/heads/master
v: v3

Author: hatahet

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
+refs/heads/master: 256913eb328027cb098aea0f231cc0e245f56714
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/libextra/uuid.rs

@@ -66,8 +66,6 @@ use std::rand::Rng;
 use std::cmp::Eq;
 use std::cast::{transmute,transmute_copy};
 
-use serialize::{Encoder, Encodable, Decoder, Decodable};
-
 /// A 128-bit (16 byte) buffer containing the ID
 pub type UuidBytes = [u8, ..16];
 
@@ -488,21 +486,6 @@ impl TotalEq for Uuid {
     }
 }
 
-// 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()
-    }
-}
-
 /// Generates a random instance of UUID (V4 conformant)
 impl rand::Rand for Uuid {
     #[inline]
@@ -787,20 +770,6 @@ 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)]

trunk/src/libstd/num/num.rs

@@ -861,7 +861,7 @@ impl_from_primitive!(f64, n.to_f64())
 /// # Example
 ///
 /// ```
-/// let twenty: f32 = num::cast(0x14);
+/// let twenty: f32 = num::cast(0x14).unwrap();
 /// assert_eq!(twenty, 20f32);
 /// ```
 ///