ref(chunks): Use NonZeroUsize in Chunked type

This allows us to avoid returning `Result` in `Chunked::from`.

Author: szokeasaurusrex

src/commands/dart_symbol_map/upload.rs

@@ -159,7 +159,7 @@ pub(super) fn execute(args: DartSymbolMapUploadArgs) -> Result<()> {
             let options = ChunkOptions::new(chunk_upload_options, org, project)
                 .with_max_wait(DEFAULT_MAX_WAIT);
 
-            let chunked = Chunked::from(object, options.server_options().chunk_size as usize)?;
+            let chunked = Chunked::from(object, (options.server_options().chunk_size as usize).try_into()?);
             let (_uploaded, has_processing_errors) = upload_chunked_objects(&[chunked], options)?;
             if has_processing_errors {
                 bail!("Some symbol maps did not process correctly");

src/utils/chunks/types.rs

@@ -2,8 +2,8 @@
 
 use std::borrow::Cow;
 use std::fmt::{Display, Formatter, Result as FmtResult};
+use std::num::NonZeroUsize;
 
-use anyhow::Result;
 use sha1_smol::Digest;
 use symbolic::common::DebugId;
 
@@ -37,7 +37,7 @@ pub struct Chunked<T> {
     chunks: Vec<Digest>,
 
     /// Size of a single chunk
-    chunk_size: usize,
+    chunk_size: NonZeroUsize,
 }
 
 impl<T> Chunked<T> {
@@ -63,14 +63,14 @@ where
 {
     /// Creates a new `ChunkedObject` from the given object, using
     /// the given chunk size.
-    pub fn from(object: T, chunk_size: usize) -> Result<Self> {
-        let (checksum, chunks) = fs::get_sha1_checksums(object.as_ref(), chunk_size.try_into()?);
-        Ok(Self {
+    pub fn from(object: T, chunk_size: NonZeroUsize) -> Self {
+        let (checksum, chunks) = fs::get_sha1_checksums(object.as_ref(), chunk_size);
+        Self {
             object,
             checksum,
             chunks,
             chunk_size,
-        })
+        }
     }
 
     /// Returns an iterator over all chunks of the object.
@@ -79,7 +79,7 @@ where
     pub fn iter_chunks(&self) -> impl Iterator<Item = Chunk<'_>> {
         self.object
             .as_ref()
-            .chunks(self.chunk_size)
+            .chunks(self.chunk_size.into())
             .zip(self.chunk_hashes().iter())
             .map(|(data, checksum)| Chunk((*checksum, data)))
     }

src/utils/dif_upload/mod.rs

@@ -1236,10 +1236,10 @@ fn upload_difs_chunked(
         processed.extend(source_bundles);
     }
 
+    let chunk_size = (chunk_options.chunk_size as usize).try_into()?;
+
     // Calculate checksums and chunks
-    let chunked = prepare_difs(processed, |m| {
-        Chunked::from(m, chunk_options.chunk_size as usize)
-    })?;
+    let chunked = prepare_difs(processed, |m| Ok(Chunked::from(m, chunk_size)))?;
 
     if options.no_upload {
         println!("{} skipping upload.", style(">").dim());

src/utils/proguard/upload.rs

@@ -26,10 +26,11 @@ pub fn chunk_upload(
     org: &str,
     project: &str,
 ) -> Result<()> {
+    let chunk_size = (chunk_upload_options.chunk_size as usize).try_into()?;
     let chunked_mappings = mappings
         .iter()
-        .map(|mapping| Chunked::from(mapping, chunk_upload_options.chunk_size as usize))
-        .collect::<Result<Vec<_>>>()?;
+        .map(|mapping| Chunked::from(mapping, chunk_size))
+        .collect::<Vec<_>>();
 
     let options =
         ChunkOptions::new(chunk_upload_options, org, project).with_max_wait(ASSEMBLE_POLL_TIMEOUT);