Upgrade RoaringBitmap Crate

Now that we use a newer version of Rust we can update to the latest version of this crate. Side Change: - Minor interface nit missed in recent block allocator review
ahrens · Sep 20, 2021 · bba40d4 · bba40d4
1 parent a1a6dd1
commit bba40d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmd/zfs_object_agent/Cargo.lock b/cmd/zfs_object_agent/Cargo.lock
diff --git a/cmd/zfs_object_agent/zettacache/Cargo.toml b/cmd/zfs_object_agent/zettacache/Cargo.toml
@@ -25,7 +25,7 @@ more-asserts = "0.2.1"
 nix = "0.22.0"
 num = "0.4.0"
 rand = "0.8.3"
-roaring = "=0.6.6"  # XXX: update to latest once we get to Rust Version 1.49.0+
+roaring = "0.7.0"
 seahash = "4.1.0"
 serde = { version = "1.0.125", features = ["derive"] }
 serde_json = "1.0.64"

diff --git a/cmd/zfs_object_agent/zettacache/src/bitmap_range_iterator.rs b/cmd/zfs_object_agent/zettacache/src/bitmap_range_iterator.rs
@@ -14,9 +14,9 @@ pub struct BitmapRangeIter<'a> {
 }
 
 impl<'a> BitmapRangeIter<'a> {
-    fn new(bitmap_iter: Fuse<Iter<'a>>) -> BitmapRangeIter<'a> {
+    fn new(bitmap: &RoaringBitmap) -> BitmapRangeIter {
         BitmapRangeIter {
-            bitmap_iter,
+            bitmap_iter: bitmap.iter().fuse(),
             current_range: None,
         }
     }
@@ -80,6 +80,6 @@ pub trait BitmapRangeIterator {
 
 impl BitmapRangeIterator for RoaringBitmap {
     fn iter_ranges(&self) -> BitmapRangeIter {
-        BitmapRangeIter::new(self.iter().fuse())
+        BitmapRangeIter::new(self)
     }
 }