Tuple deserialization should not fail

rust-lang · Nov 1, 2014 · 05f6bda · 05f6bda · bors · Nov 1, 2014
1 parent ca6b082
commit 05f6bda
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/librbml/lib.rs b/src/librbml/lib.rs
@@ -562,10 +562,12 @@ pub mod reader {
                          f: |&mut Decoder<'doc>| -> DecodeResult<T>) -> DecodeResult<T> {
             debug!("read_tuple()");
             self.read_seq(|d, len| {
-                assert!(len == tuple_len,
-                        "expected tuple of length `{}`, found tuple \
-                         of length `{}`", tuple_len, len);
-                f(d)
+                if len == tuple_len {
+                    f(d)
+                } else {
+                    Err(Expected(format!("Expected tuple of length `{}`, \
+                                          found tuple of length `{}`", tuple_len, len)))
+                }
             })
         }
 

diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
@@ -2153,13 +2153,17 @@ impl ::Decoder<DecoderError> for Decoder {
         Ok(value)
     }
 
-    fn read_tuple<T>(&mut self, tuple_len: uint, f: |&mut Decoder| -> DecodeResult<T>) -> DecodeResult<T> {
+    fn read_tuple<T>(&mut self,
+                     tuple_len: uint,
+                     f: |&mut Decoder| -> DecodeResult<T>)
+                     -> DecodeResult<T> {
         debug!("read_tuple()");
         self.read_seq(|d, len| {
-            assert!(len == tuple_len,
-                    "expected tuple of length `{}`, found tuple \
-                         of length `{}`", tuple_len, len);
-            f(d)
+            if len == tuple_len {
+                f(d)
+            } else {
+                Err(ExpectedError(format!("Tuple{}", tuple_len), format!("Tuple{}", len)))
+            }
         })
     }
 
@@ -2893,9 +2897,8 @@ mod tests {
     }
 
     #[test]
-    #[should_fail]
     fn test_decode_tuple_malformed_length() {
-        let _ = super::decode::<(uint, uint)>("[1, 2, 3]");
+        assert!(super::decode::<(uint, uint)>("[1, 2, 3]").is_err());
     }
 
     #[test]