---

graydon · graydon · commit 1cf4b90c15e5 · 2012-10-04T14:08:59.000-07:00
yaml --- r: 31006 b: refs/heads/incoming c: f05bf26 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 6ffce1a1c305d2bfeb530bac7628e2f28b4b880c
+refs/heads/incoming: f05bf26f859f9e373d5044048b8c937023497690
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libstd/serialization.rs b/branches/incoming/src/libstd/serialization.rs
@@ -239,7 +239,8 @@ pub fn deserialize_bool<D: Deserializer>(&&d: D) -> bool {
     d.read_bool()
 }
 
-pub fn serialize_Option<S: Serializer,T>(&&s: S, &&v: Option<T>, st: fn(&&x: T)) {
+pub fn serialize_Option<S: Serializer,T>(&&s: S, &&v: Option<T>,
+                                         st: fn(&&x: T)) {
     do s.emit_enum(~"option") {
         match v {
           None => do s.emit_enum_variant(~"none", 0u, 0u) {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,8 @@ pub fn deserialize_bool<D: Deserializer>(&&d: D) -> bool {`
`239`	`239`	`d.read_bool()`
`240`	`240`	`}`
`241`	`241`
`242`		`-pub fn serialize_Option<S: Serializer,T>(&&s: S, &&v: Option<T>, st: fn(&&x: T)) {`
	`242`	`+pub fn serialize_Option<S: Serializer,T>(&&s: S, &&v: Option<T>,`
	`243`	`+ st: fn(&&x: T)) {`
`243`	`244`	`do s.emit_enum(~"option") {`
`244`	`245`	`match v {`
`245`	`246`	`None => do s.emit_enum_variant(~"none", 0u, 0u) {`