---

yaml
---
r: 50279
b: refs/heads/auto
c: 89fc958
h: refs/heads/master
i:
  50277: f22a62c
  50275: 405be77
  50271: fefa2ea
v: v3

Author: erickt

[refs]

@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b290863be6fa40f0e4f91ba91ff8c5eeb08c6524
+refs/heads/auto: 89fc95885fa01621031e678e59bae54472141d0f
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/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,