Skip to content

Commit a539b0d

Browse files
committed
Update libworkcache with libserialize's json changes
1 parent 18bed22 commit a539b0d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/libworkcache/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ fn json_encode<'a, T:Encodable<json::Encoder<'a>, io::IoError>>(t: &T) -> ~str {
261261
}
262262

263263
// FIXME(#5121)
264-
fn json_decode<T:Decodable<json::Decoder, json::Error>>(s: &str) -> T {
264+
fn json_decode<T:Decodable<json::Decoder, json::DecoderError>>(s: &str) -> T {
265265
debug!("json decoding: {}", s);
266266
let j = json::from_str(s).unwrap();
267267
let mut decoder = json::Decoder::new(j);
@@ -394,14 +394,14 @@ impl<'a> Prep<'a> {
394394

395395
pub fn exec<'a, T:Send +
396396
Encodable<json::Encoder<'a>, io::IoError> +
397-
Decodable<json::Decoder, json::Error>>(
397+
Decodable<json::Decoder, json::DecoderError>>(
398398
&'a self, blk: proc(&mut Exec):Send -> T) -> T {
399399
self.exec_work(blk).unwrap()
400400
}
401401

402402
fn exec_work<'a, T:Send +
403403
Encodable<json::Encoder<'a>, io::IoError> +
404-
Decodable<json::Decoder, json::Error>>( // FIXME(#5121)
404+
Decodable<json::Decoder, json::DecoderError>>( // FIXME(#5121)
405405
&'a self, blk: proc(&mut Exec):Send -> T) -> Work<'a, T> {
406406
let mut bo = Some(blk);
407407

@@ -445,7 +445,7 @@ impl<'a> Prep<'a> {
445445

446446
impl<'a, T:Send +
447447
Encodable<json::Encoder<'a>, io::IoError> +
448-
Decodable<json::Decoder, json::Error>>
448+
Decodable<json::Decoder, json::DecoderError>>
449449
Work<'a, T> { // FIXME(#5121)
450450

451451
pub fn from_value(elt: T) -> Work<'a, T> {

0 commit comments

Comments
 (0)