DOSE-661 Follow On

Side-Fix:
* Add clippy for tests in `make rustclippy` target

Makefile.am

@@ -149,6 +149,7 @@ rustclippy: $(RUSTDIRS)
 		set -e ; \
 		for dir in $(RUSTDIRS) ; do \
 			cargo clippy --workspace --manifest-path $$dir/Cargo.toml -- -Dwarnings ; \
+			cargo clippy --tests --workspace --manifest-path $$dir/Cargo.toml -- -Dwarnings ; \
 		done \
 	else \
 		echo "skipping rustclippy because cargo-clippy is not installed"; \

cmd/zfs_object_agent/zettacache/src/bitmap_range_iterator.rs

@@ -160,7 +160,7 @@ mod tests {
     fn test_start_range_end_range() {
         let mut a = RoaringBitmap::new();
         a.insert_range(0..2);
-        a.insert_range(10..2);
+        a.insert_range(10..12);
         validate_iter_ranges(&a);
     }
 
@@ -192,7 +192,7 @@ mod tests {
     fn test_middle_range_end_range() {
         let mut a = RoaringBitmap::new();
         a.insert_range(5..7);
-        a.insert_range(10..2);
+        a.insert_range(10..12);
         validate_iter_ranges(&a);
     }
 

cmd/zfs_object_agent/zettacache/src/block_allocator.rs

@@ -227,8 +227,8 @@ impl SlabTrait for BitmapSlab {
         for slot in self.allocatable.iter() {
             let slot_offset = self.to_offset(slot);
             spacemap.alloc(alloc_offset, slot_offset - alloc_offset);
-            alloc_offset = slot_offset + u64::from(self.slot_size);
             written_segments += (slot_offset - alloc_offset) / u64::from(self.slot_size);
+            alloc_offset = slot_offset + u64::from(self.slot_size);
         }
         spacemap.alloc(alloc_offset, self.end_offset() - alloc_offset);
         written_segments += (self.end_offset() - alloc_offset) / u64::from(self.slot_size);