1
Fork 0

test: Remove all remaining non-procedure uses of do.

This commit is contained in:
Patrick Walton 2013-11-21 19:20:48 -08:00
parent f571e46ddb
commit 38efa17bb8
34 changed files with 385 additions and 392 deletions

View file

@ -1521,33 +1521,33 @@ mod tests {
fn test_write_enum() {
let animal = Dog;
assert_eq!(
do with_str_writer |wr| {
with_str_writer(|wr| {
let mut encoder = Encoder(wr);
animal.encode(&mut encoder);
},
}),
~"\"Dog\""
);
assert_eq!(
do with_str_writer |wr| {
with_str_writer(|wr| {
let mut encoder = PrettyEncoder(wr);
animal.encode(&mut encoder);
},
}),
~"\"Dog\""
);
let animal = Frog(~"Henry", 349);
assert_eq!(
do with_str_writer |wr| {
with_str_writer(|wr| {
let mut encoder = Encoder(wr);
animal.encode(&mut encoder);
},
}),
~"{\"variant\":\"Frog\",\"fields\":[\"Henry\",349]}"
);
assert_eq!(
do with_str_writer |wr| {
with_str_writer(|wr| {
let mut encoder = PrettyEncoder(wr);
animal.encode(&mut encoder);
},
}),
~"\
[\n \
\"Frog\",\n \
@ -1560,33 +1560,33 @@ mod tests {
#[test]
fn test_write_some() {
let value = Some(~"jodhpurs");
let s = do with_str_writer |wr| {
let s = with_str_writer(|wr| {
let mut encoder = Encoder(wr);
value.encode(&mut encoder);
};
});
assert_eq!(s, ~"\"jodhpurs\"");
let value = Some(~"jodhpurs");
let s = do with_str_writer |wr| {
let s = with_str_writer(|wr| {
let mut encoder = PrettyEncoder(wr);
value.encode(&mut encoder);
};
});
assert_eq!(s, ~"\"jodhpurs\"");
}
#[test]
fn test_write_none() {
let value: Option<~str> = None;
let s = do with_str_writer |wr| {
let s = with_str_writer(|wr| {
let mut encoder = Encoder(wr);
value.encode(&mut encoder);
};
});
assert_eq!(s, ~"null");
let s = do with_str_writer |wr| {
let s = with_str_writer(|wr| {
let mut encoder = Encoder(wr);
value.encode(&mut encoder);
};
});
assert_eq!(s, ~"null");
}