Use integer divisibility methods across the workspace

Author: i-norden

copc-core/src/columns.rs

@@ -271,7 +271,7 @@ impl ColumnSpec {
             let width = self.extra_byte_width().ok_or_else(|| {
                 Error::InvalidInput("ExtraBytes column requires a non-zero byte width".into())
             })?;
-            if data.len() % width != 0 {
+            if !data.len().is_multiple_of(width) {
                 return Err(Error::InvalidInput(format!(
                     "ExtraBytes column has {} bytes, which is not divisible by byte width {width}",
                     data.len()

copc-core/src/hierarchy.rs

@@ -211,7 +211,7 @@ impl HierarchyPage {
     }
 
     pub fn from_le_bytes(bytes: &[u8]) -> Result<Self> {
-        if bytes.len() % HIERARCHY_ENTRY_BYTES != 0 {
+        if !bytes.len().is_multiple_of(HIERARCHY_ENTRY_BYTES) {
             return Err(Error::InvalidData(format!(
                 "hierarchy page is {} bytes, not a multiple of {}",
                 bytes.len(),

copc-core/src/info.rs

@@ -86,7 +86,10 @@ impl CopcInfo {
                 "COPC root hierarchy page is empty".into(),
             ));
         }
-        if self.root_hier_size % HIERARCHY_ENTRY_BYTES as u64 != 0 {
+        if !self
+            .root_hier_size
+            .is_multiple_of(HIERARCHY_ENTRY_BYTES as u64)
+        {
             return Err(Error::InvalidData(format!(
                 "COPC root hierarchy size {} is not a multiple of {HIERARCHY_ENTRY_BYTES}",
                 self.root_hier_size

copc-reader/src/lib.rs

@@ -369,7 +369,7 @@ fn read_hierarchy_page_at<R: Read + Seek>(
     if byte_size == 0 {
         return Err(Error::InvalidData("hierarchy page is empty".into()));
     }
-    if byte_size % HIERARCHY_ENTRY_BYTES as u64 != 0 {
+    if !byte_size.is_multiple_of(HIERARCHY_ENTRY_BYTES as u64) {
         return Err(Error::InvalidData(format!(
             "hierarchy page is {byte_size} bytes, not a multiple of {HIERARCHY_ENTRY_BYTES}"
         )));

copc-reader/src/points.rs

@@ -306,7 +306,7 @@ impl ChunkColumnDecoder {
         let mut point_buf = vec![0u8; self.record_size];
         let mut accepted = 0usize;
         for decoded in 0..points_in_chunk {
-            if decoded % CANCEL_POLL_STRIDE == 0 {
+            if decoded.is_multiple_of(CANCEL_POLL_STRIDE) {
                 if let Some(cancel) = cancel {
                     cancel.check()?;
                 }
@@ -780,7 +780,7 @@ impl<'a, R: Read + Seek + Send> PointIter<'a, R> {
                 }
             }
 
-            if self.decoded_points % CANCEL_POLL_STRIDE == 0 {
+            if self.decoded_points.is_multiple_of(CANCEL_POLL_STRIDE) {
                 if let Some(cancel) = self.cancel {
                     cancel.check()?;
                 }

copc-reader/src/ranged.rs

@@ -310,7 +310,7 @@ impl<S: RangeRead> CopcRangeReader<S> {
         if !self.visited_pages.insert((page_entry.offset, byte_size)) {
             return Ok(());
         }
-        if byte_size == 0 || byte_size % copc_core::HIERARCHY_ENTRY_BYTES as u64 != 0 {
+        if byte_size == 0 || !byte_size.is_multiple_of(copc_core::HIERARCHY_ENTRY_BYTES as u64) {
             return Err(Error::InvalidData(format!(
                 "hierarchy page is {byte_size} bytes, not a multiple of {}",
                 copc_core::HIERARCHY_ENTRY_BYTES

copc-writer/src/lod.rs

@@ -155,7 +155,7 @@ impl<S: CopcPointSource, W: Write> LodIndexBuilder<'_, S, W> {
 fn write_root_index_run(total_points: u32, cancel: &dyn CancelCheck) -> Result<IndexRun> {
     let mut writer = BufWriter::with_capacity(INDEX_IO_BUFFER_BYTES, new_index_tempfile("root")?);
     for index in 0..total_points {
-        if index as usize % CANCEL_POLL_STRIDE == 0 {
+        if (index as usize).is_multiple_of(CANCEL_POLL_STRIDE) {
             cancel.check()?;
         }
         writer
@@ -183,7 +183,7 @@ fn partition_index_run<S: CopcPointSource>(
     let mut counts = [0usize; 8];
     let center = bounds.center();
     for read_index in 0..run.count {
-        if read_index % CANCEL_POLL_STRIDE == 0 {
+        if read_index.is_multiple_of(CANCEL_POLL_STRIDE) {
             cancel.check()?;
         }
         let index = reader
@@ -276,7 +276,7 @@ fn append_index_run_to_order<W: Write>(
 ) -> Result<()> {
     let mut reader = open_index_run(run)?;
     for read_index in 0..run.count {
-        if read_index % CANCEL_POLL_STRIDE == 0 {
+        if read_index.is_multiple_of(CANCEL_POLL_STRIDE) {
             cancel.check()?;
         }
         let index = reader

copc-writer/src/spill.rs

@@ -276,12 +276,12 @@ mod tests {
             return_number: (seed % 5) as u8,
             number_of_returns: 5,
             classification: (seed % 32) as u8,
-            scan_direction_flag: seed % 2 == 0,
-            edge_of_flight_line: seed % 3 == 0,
+            scan_direction_flag: seed.is_multiple_of(2),
+            edge_of_flight_line: seed.is_multiple_of(3),
             scan_angle: (seed as f32) - 100.25,
             user_data: (seed % 256) as u8,
             point_source_id: seed as u16,
-            synthetic: seed % 4 == 0,
+            synthetic: seed.is_multiple_of(4),
             key_point: seed % 4 == 1,
             withheld: seed % 4 == 2,
             overlap: false,

copc-writer/src/validate.rs

@@ -142,7 +142,7 @@ pub(crate) fn validate_source_points<S: CopcPointSource>(
     let mut stats = PointStats::new();
     let mut fields = CopcPointFields::default();
     for index in 0..source.len() {
-        if index % CANCEL_POLL_STRIDE == 0 {
+        if index.is_multiple_of(CANCEL_POLL_STRIDE) {
             cancel.check()?;
         }
         let (x, y, z) = source.xyz(index)?;

copc-writer/src/writer.rs

@@ -123,7 +123,7 @@ where
     validate_streaming_layout_supported(&layout)?;
     let mut spill = SpillWriter::create(spill_dir, layout)?;
     for (index, item) in points.into_iter().enumerate() {
-        if index % CANCEL_POLL_STRIDE == 0 {
+        if index.is_multiple_of(CANCEL_POLL_STRIDE) {
             cancel.check()?;
         }
         spill.push(&item?)?;
@@ -193,7 +193,7 @@ fn convert_las_to_copc_streaming_inner(
             break;
         }
         for result in point_data.points() {
-            if index % CANCEL_POLL_STRIDE == 0 {
+            if index.is_multiple_of(CANCEL_POLL_STRIDE) {
                 cancel.check()?;
             }
             let point = result.map_err(|e| Error::Las(e.to_string()))?;
@@ -597,7 +597,7 @@ fn encode_node_points<S: CopcPointSource>(
         .seek(SeekFrom::Start(node.start))
         .map_err(|e| Error::io("seek LOD order", e))?;
     for point_index in 0..node.count {
-        if point_index % CANCEL_POLL_STRIDE == 0 {
+        if point_index.is_multiple_of(CANCEL_POLL_STRIDE) {
             cancel.check()?;
         }
         let source_index = index_reader