hash_u64_file now returns an Error instead of panicking.

Author: hbina

src/cargo/ops/cargo_package.rs

@@ -747,7 +747,7 @@ fn hash_all(path: &Path) -> CargoResult<HashMap<PathBuf, u64>> {
             let file_type = entry.file_type();
             if file_type.is_file() {
                 let file = File::open(entry.path())?;
-                let hash = util::hex::hash_u64_file(&file);
+                let hash = util::hex::hash_u64_file(&file)?;
                 result.insert(entry.path().to_path_buf(), hash);
             } else if file_type.is_symlink() {
                 let hash = util::hex::hash_u64(&fs::read_link(entry.path())?);

src/cargo/util/hex.rs

@@ -23,17 +23,17 @@ pub fn hash_u64<H: Hash>(hashable: H) -> u64 {
     hasher.finish()
 }
 
-pub fn hash_u64_file(mut file: &File) -> u64 {
+pub fn hash_u64_file(mut file: &File) -> std::io::Result<u64> {
     let mut hasher = SipHasher::new_with_keys(0, 0);
     let mut buf = [0; 64 * 1024];
     loop {
-        let n = file.read(&mut buf).unwrap();
+        let n = file.read(&mut buf)?;
         if n == 0 {
             break;
         }
         hasher.write(&buf[..n]);
     }
-    hasher.finish()
+    Ok(hasher.finish())
 }
 
 pub fn short_hash<H: Hash>(hashable: &H) -> String {