---

yaml
---
r: 139370
b: refs/heads/try2
c: 89fc958
h: refs/heads/master
v: v3

Author: erickt

[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: b290863be6fa40f0e4f91ba91ff8c5eeb08c6524
+refs/heads/try2: 89fc95885fa01621031e678e59bae54472141d0f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/serialize.rs

@@ -368,12 +368,12 @@ impl<D:Decoder,T:Decodable<D>> Decodable<D> for @[T] {
 
 impl<S:Encoder,T:Encodable<S>> Encodable<S> for Option<T> {
     fn encode(&self, s: &S) {
-        do s.emit_enum(~"option") {
+        do s.emit_enum(~"Option") {
             match *self {
-              None => do s.emit_enum_variant(~"none", 0u, 0u) {
+              None => do s.emit_enum_variant(~"None", 0u, 0u) {
               },
 
-              Some(ref v) => do s.emit_enum_variant(~"some", 1u, 1u) {
+              Some(ref v) => do s.emit_enum_variant(~"Some", 1u, 1u) {
                 s.emit_enum_variant_arg(0u, || v.encode(s))
               }
             }
@@ -383,7 +383,7 @@ impl<S:Encoder,T:Encodable<S>> Encodable<S> for Option<T> {
 
 impl<D:Decoder,T:Decodable<D>> Decodable<D> for Option<T> {
     fn decode(d: &D) -> Option<T> {
-        do d.read_enum(~"option") {
+        do d.read_enum(~"Option") {
             do d.read_enum_variant |i| {
                 match i {
                   0 => None,