Fix existing tests.

Author: gilescope

tests/testsuite/dep_info.rs

@@ -26,6 +26,10 @@ fn assert_deps(project: &Project, fingerprint: &str, test_cb: impl Fn(&Path, &[(
     let dep_info = &mut &dep_info[..];
     let deps = (0..read_usize(dep_info))
         .map(|_| {
+            //FIXME rather than discarding these we could check them?
+            read_u64(dep_info); //filesize
+            str::from_utf8(read_bytes(dep_info)).unwrap(); //hash
+            read_u8(dep_info); //hashkind
             (
                 read_u8(dep_info),
                 str::from_utf8(read_bytes(dep_info)).unwrap(),
@@ -49,6 +53,21 @@ fn assert_deps(project: &Project, fingerprint: &str, test_cb: impl Fn(&Path, &[(
         ret
     }
 
+    fn read_u64(bytes: &mut &[u8]) -> Option<u64> {
+        let ret = bytes.get(..8)?;
+        *bytes = &bytes[8..];
+        Some(
+            ((ret[0] as u64) << 0)
+                | ((ret[1] as u64) << 8)
+                | ((ret[2] as u64) << 16)
+                | ((ret[3] as u64) << 24)
+                | ((ret[4] as u64) << 32)
+                | ((ret[5] as u64) << 40)
+                | ((ret[6] as u64) << 48)
+                | ((ret[7] as u64) << 56),
+        )
+    }
+
     fn read_bytes<'a>(bytes: &mut &'a [u8]) -> &'a [u8] {
         let n = read_usize(bytes) as usize;
         let ret = &bytes[..n];