---

yaml
---
r: 32533
b: refs/heads/dist-snap
c: cd8ec6d
h: refs/heads/master
i:
  32531: ab8236c
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 298eb8c7260fe321e30d9c5e22f4ecefc82c4f64
+refs/heads/dist-snap: cd8ec6d9236867d3f088432033f56b6ad29c15a7
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libstd/ebml.rs

@@ -570,11 +570,11 @@ impl EbmlDeserializer: serialization::Deserializer {
 
 #[test]
 fn test_option_int() {
-    fn serialize_1<S: serialization::serializer>(s: S, v: int) {
+    fn serialize_1<S: serialization::Serializer>(s: S, v: int) {
         s.emit_i64(v as i64);
     }
 
-    fn serialize_0<S: serialization::serializer>(s: S, v: Option<int>) {
+    fn serialize_0<S: serialization::Serializer>(s: S, v: Option<int>) {
         do s.emit_enum(~"core::option::t") {
             match v {
               None => s.emit_enum_variant(
@@ -588,11 +588,11 @@ fn test_option_int() {
         }
     }
 
-    fn deserialize_1<S: serialization::deserializer>(s: S) -> int {
+    fn deserialize_1<S: serialization::Deserializer>(s: S) -> int {
         s.read_i64() as int
     }
 
-    fn deserialize_0<S: serialization::deserializer>(s: S) -> Option<int> {
+    fn deserialize_0<S: serialization::Deserializer>(s: S) -> Option<int> {
         do s.read_enum(~"core::option::t") {
             do s.read_enum_variant |i| {
                 match i {