1
Fork 0

librustc: Fix merge fallout.

This commit is contained in:
Patrick Walton 2013-11-24 11:44:28 -08:00
parent 151b7ed52d
commit 9521551b47
24 changed files with 43 additions and 59 deletions

View file

@ -1983,7 +1983,7 @@ mod tests {
}
fn check_err<T: Decodable<Decoder>>(to_parse: &'static str, expected_error: &str) {
use std::task;
let res = task::try(|| {
let res = do task::try {
// either fails in `decode` (which is what we want), or
// returns Some(error_message)/None if the string was
// invalid or valid JSON.
@ -1994,7 +1994,7 @@ mod tests {
None
}
}
});
};
match res {
Ok(Some(parse_error)) => fail!("`{}` is not valid json: {}",
to_parse, parse_error),