---

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

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b290863be6fa40f0e4f91ba91ff8c5eeb08c6524
+refs/heads/master: 89fc95885fa01621031e678e59bae54472141d0f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/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,