diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-07-26 18:03:57 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-07-27 23:41:09 -0700 |
| commit | e308167a2fe558924fcebcc99358c057ae0b90b4 (patch) | |
| tree | 6e2905fc4a4768bc9952d8e10703d486404b0821 /src/libextra | |
| parent | 4eb95f6d1c22419b50980d0bf8effc6e2f22feb5 (diff) | |
| download | rust-e308167a2fe558924fcebcc99358c057ae0b90b4.tar.gz rust-e308167a2fe558924fcebcc99358c057ae0b90b4.zip | |
cleanup .unwrap and .unwrap_err fixing io tests
Diffstat (limited to 'src/libextra')
| -rw-r--r-- | src/libextra/workcache.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libextra/workcache.rs b/src/libextra/workcache.rs index 42210d0cd89..1cabab713b8 100644 --- a/src/libextra/workcache.rs +++ b/src/libextra/workcache.rs @@ -22,7 +22,6 @@ use std::cell::Cell; use std::comm::{PortOne, oneshot, send_one, recv_one}; use std::either::{Either, Left, Right}; use std::io; -use std::result; use std::run; use std::task; @@ -208,7 +207,7 @@ fn json_encode<T:Encodable<json::Encoder>>(t: &T) -> ~str { // FIXME(#5121) fn json_decode<T:Decodable<json::Decoder>>(s: &str) -> T { do io::with_str_reader(s) |rdr| { - let j = result::unwrap(json::from_reader(rdr)); + let j = json::from_reader(rdr).unwrap(); let mut decoder = json::Decoder(j); Decodable::decode(&mut decoder) } |