diff --git a/src/utils/dif_upload.rs b/src/utils/dif_upload.rs index 67bfa9b83a..863b2cc0a3 100644 --- a/src/utils/dif_upload.rs +++ b/src/utils/dif_upload.rs @@ -332,7 +332,7 @@ impl<'data> ChunkedDifMatch<'data> { /// Slices the DIF into chunks of `chunk_size` bytes each, and computes SHA1 /// checksums for every chunk as well as the entire DIF. pub fn from(inner: DifMatch<'data>, chunk_size: u64) -> Result { - let (checksum, chunks) = get_sha1_checksums(inner.data(), chunk_size)?; + let (checksum, chunks) = get_sha1_checksums(inner.data(), chunk_size as usize)?; Ok(ChunkedDifMatch { inner: HashedDifMatch { inner, checksum }, chunks, diff --git a/src/utils/file_upload.rs b/src/utils/file_upload.rs index 904c88350a..fb5f2ae74d 100644 --- a/src/utils/file_upload.rs +++ b/src/utils/file_upload.rs @@ -412,7 +412,7 @@ fn upload_files_chunked( pb.set_style(progress_style); let view = ByteView::open(archive.path())?; - let (checksum, checksums) = get_sha1_checksums(&view, options.chunk_size)?; + let (checksum, checksums) = get_sha1_checksums(&view, options.chunk_size as usize)?; let mut chunks = view .chunks(options.chunk_size as usize) .zip(checksums.iter()) diff --git a/src/utils/fs.rs b/src/utils/fs.rs index 338630ae95..74377cbe8b 100644 --- a/src/utils/fs.rs +++ b/src/utils/fs.rs @@ -171,7 +171,7 @@ pub fn get_sha1_checksum(rdr: R) -> Result { /// Returns the SHA1 hash for the entire input, as well as each chunk of it. The /// `chunk_size` must be a power of two. -pub fn get_sha1_checksums(data: &[u8], chunk_size: u64) -> Result<(Digest, Vec)> { +pub fn get_sha1_checksums(data: &[u8], chunk_size: usize) -> Result<(Digest, Vec)> { if !chunk_size.is_power_of_two() { bail!("Chunk size must be a power of two"); } @@ -179,7 +179,7 @@ pub fn get_sha1_checksums(data: &[u8], chunk_size: u64) -> Result<(Digest, Vec