about summary refs log tree commit diff
path: root/src/libstd/serialization.rs
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-06-30 16:19:07 -0700
committerBrian Anderson <banderson@mozilla.com>2012-07-01 19:19:32 -0700
commitd1fc2b5995fdef69fe1dbdbba3703398c0aa547b (patch)
treeb6d14fd0e920512a29c64a671cc2a5bb90132abb /src/libstd/serialization.rs
parent13a8f545388929a07af110a950441e6a1b88473a (diff)
downloadrust-d1fc2b5995fdef69fe1dbdbba3703398c0aa547b.tar.gz
rust-d1fc2b5995fdef69fe1dbdbba3703398c0aa547b.zip
Convert to new closure syntax
Diffstat (limited to 'src/libstd/serialization.rs')
-rw-r--r--src/libstd/serialization.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/libstd/serialization.rs b/src/libstd/serialization.rs
index 6819711aad6..a5d56bda0ef 100644
--- a/src/libstd/serialization.rs
+++ b/src/libstd/serialization.rs
@@ -84,9 +84,9 @@ iface deserializer {
 // In some cases, these should eventually be coded as traits.
 
 fn emit_from_vec<S: serializer, T>(s: S, v: ~[T], f: fn(T)) {
-    do s.emit_vec(vec::len(v)) {||
-        do vec::iteri(v) {|i,e|
-            do s.emit_vec_elt(i) {||
+    do s.emit_vec(vec::len(v)) || {
+        do vec::iteri(v) |i,e| {
+            do s.emit_vec_elt(i) || {
                 f(e)
             }
         }
@@ -94,9 +94,9 @@ fn emit_from_vec<S: serializer, T>(s: S, v: ~[T], f: fn(T)) {
 }
 
 fn read_to_vec<D: deserializer, T: copy>(d: D, f: fn() -> T) -> ~[T] {
-    do d.read_vec {|len|
-        do vec::from_fn(len) {|i|
-            do d.read_vec_elt(i) {|| f() }
+    do d.read_vec |len| {
+        do vec::from_fn(len) |i| {
+            d.read_vec_elt(i, || f())
         }
     }
 }
@@ -234,16 +234,16 @@ fn deserialize_bool<D: deserializer>(d: D) -> bool {
 }
 
 fn serialize_option<S: serializer,T>(s: S, v: option<T>, st: fn(T)) {
-    do s.emit_enum("option") {||
+    do s.emit_enum("option") || {
         alt v {
           none {
-            do s.emit_enum_variant("none", 0u, 0u) {||
+            do s.emit_enum_variant("none", 0u, 0u) || {
             }
           }
 
           some(v) {
-            do s.emit_enum_variant("some", 1u, 1u) {||
-                do s.emit_enum_variant_arg(0u) {||
+            do s.emit_enum_variant("some", 1u, 1u) || {
+                do s.emit_enum_variant_arg(0u) || {
                     st(v)
                 }
             }
@@ -254,14 +254,14 @@ fn serialize_option<S: serializer,T>(s: S, v: option<T>, st: fn(T)) {
 
 fn deserialize_option<D: deserializer,T: copy>(d: D, st: fn() -> T)
     -> option<T> {
-    do d.read_enum("option") {||
-        do d.read_enum_variant {|i|
+    do d.read_enum("option") || {
+        do d.read_enum_variant |i| {
             alt check i {
               0u { // none
                 none
               }
               1u { // some(v)
-                some(d.read_enum_variant_arg(0u, {||
+                some(d.read_enum_variant_arg(0u, || {
                     st()
                 }))
               }