rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Eliminate usages of old sugared call syntax

Browse Source
This commit is contained in:
Brian Anderson
2012-06-26 13:55:56 -07:00
parent 8b2491160d
commit a3382b6f26
280 changed files with 1561 additions and 1572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libstd/serialization.rs
View File

@@ -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)) {
s.emit_vec(vec::len(v)) {||
vec::iteri(v) {|i,e|
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] {
d.read_vec {|len|
vec::from_fn(len) {|i|
d.read_vec_elt(i) {|| f() }
do d.read_vec {|len|
do vec::from_fn(len) {|i|
do 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)) {
s.emit_enum("option") {||
do s.emit_enum("option") {||
alt v {
none {
s.emit_enum_variant("none", 0u, 0u) {||
do s.emit_enum_variant("none", 0u, 0u) {||
}
}
some(v) {
s.emit_enum_variant("some", 1u, 1u) {||
s.emit_enum_variant_arg(0u) {||
do s.emit_enum_variant("some", 1u, 1u) {||
do s.emit_enum_variant_arg(0u) {||
st(v)
}
}
@@ -254,16 +254,16 @@ 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> {
d.read_enum("option") {||
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()
})
}))
}
}
}