Skip to content

Commit 019c121

Browse files
committed
---
yaml --- r: 51031 b: refs/heads/try c: 89fc958 h: refs/heads/master i: 51029: ecd847f 51027: 12cb301 51023: b9d26d8 v: v3
1 parent faa6cb5 commit 019c121

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
5-
refs/heads/try: b290863be6fa40f0e4f91ba91ff8c5eeb08c6524
5+
refs/heads/try: 89fc95885fa01621031e678e59bae54472141d0f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/serialize.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,12 +368,12 @@ impl<D:Decoder,T:Decodable<D>> Decodable<D> for @[T] {
368368

369369
impl<S:Encoder,T:Encodable<S>> Encodable<S> for Option<T> {
370370
fn encode(&self, s: &S) {
371-
do s.emit_enum(~"option") {
371+
do s.emit_enum(~"Option") {
372372
match *self {
373-
None => do s.emit_enum_variant(~"none", 0u, 0u) {
373+
None => do s.emit_enum_variant(~"None", 0u, 0u) {
374374
},
375375

376-
Some(ref v) => do s.emit_enum_variant(~"some", 1u, 1u) {
376+
Some(ref v) => do s.emit_enum_variant(~"Some", 1u, 1u) {
377377
s.emit_enum_variant_arg(0u, || v.encode(s))
378378
}
379379
}
@@ -383,7 +383,7 @@ impl<S:Encoder,T:Encodable<S>> Encodable<S> for Option<T> {
383383

384384
impl<D:Decoder,T:Decodable<D>> Decodable<D> for Option<T> {
385385
fn decode(d: &D) -> Option<T> {
386-
do d.read_enum(~"option") {
386+
do d.read_enum(~"Option") {
387387
do d.read_enum_variant |i| {
388388
match i {
389389
0 => None,

0 commit comments

Comments
 (0)