Update libworkcache with libserialize's json changes

diff --git a/src/libworkcache/lib.rs b/src/libworkcache/lib.rs
index f662977ae0f9c2a0d51a1ec770eb2fe568e37f90..9343de83d4d7c09ee459fe462f8e5132f8ffdea0 100644 (file)
--- 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 @@ fn all_fresh(&self, cat: &str, map: &WorkMap) -> bool {
 
     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 @@ fn exec_work<'a, T:Send +
 
 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> {