diff options
| author | Nicolas Silva <nical.silva@gmail.com> | 2014-04-09 10:25:23 +0200 |
|---|---|---|
| committer | Nicolas Silva <nical.silva@gmail.com> | 2014-04-27 23:09:57 +0200 |
| commit | a539b0d5831e6dcabff21d9c34ba55d782467961 (patch) | |
| tree | 7555910f0f02c0adbe319cc0016b8018e1aacc06 /src/libworkcache | |
| parent | 18bed22e5a0f7f878efd995836c845d4890fc1fd (diff) | |
| download | rust-a539b0d5831e6dcabff21d9c34ba55d782467961.tar.gz rust-a539b0d5831e6dcabff21d9c34ba55d782467961.zip | |
Update libworkcache with libserialize's json changes
Diffstat (limited to 'src/libworkcache')
| -rw-r--r-- | src/libworkcache/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libworkcache/lib.rs b/src/libworkcache/lib.rs index f662977ae0f..9343de83d4d 100644 --- a/src/libworkcache/lib.rs +++ b/src/libworkcache/lib.rs @@ -261,7 +261,7 @@ fn json_encode<'a, T:Encodable<json::Encoder<'a>, io::IoError>>(t: &T) -> ~str { } // FIXME(#5121) -fn json_decode<T:Decodable<json::Decoder, json::Error>>(s: &str) -> T { +fn json_decode<T:Decodable<json::Decoder, json::DecoderError>>(s: &str) -> T { debug!("json decoding: {}", s); let j = json::from_str(s).unwrap(); let mut decoder = json::Decoder::new(j); @@ -394,14 +394,14 @@ impl<'a> Prep<'a> { pub fn exec<'a, T:Send + Encodable<json::Encoder<'a>, io::IoError> + - Decodable<json::Decoder, json::Error>>( + Decodable<json::Decoder, json::DecoderError>>( &'a self, blk: proc(&mut Exec):Send -> T) -> T { self.exec_work(blk).unwrap() } fn exec_work<'a, T:Send + Encodable<json::Encoder<'a>, io::IoError> + - Decodable<json::Decoder, json::Error>>( // FIXME(#5121) + Decodable<json::Decoder, json::DecoderError>>( // FIXME(#5121) &'a self, blk: proc(&mut Exec):Send -> T) -> Work<'a, T> { let mut bo = Some(blk); @@ -445,7 +445,7 @@ impl<'a> Prep<'a> { impl<'a, T:Send + Encodable<json::Encoder<'a>, io::IoError> + - Decodable<json::Decoder, json::Error>> + Decodable<json::Decoder, json::DecoderError>> Work<'a, T> { // FIXME(#5121) pub fn from_value(elt: T) -> Work<'a, T> { |