diff --git a/bucket_map/src/bucket.rs b/bucket_map/src/bucket.rs index d5545ab063..2ce75908f4 100644 --- a/bucket_map/src/bucket.rs +++ b/bucket_map/src/bucket.rs @@ -65,7 +65,7 @@ impl Bucket { rv } - pub fn range(&self, range: Option<&R>) -> Vec> + pub fn items_in_range(&self, range: Option<&R>) -> Vec> where R: RangeBounds, { diff --git a/bucket_map/src/bucket_map.rs b/bucket_map/src/bucket_map.rs index 2402261caf..5a3dee4c63 100644 --- a/bucket_map/src/bucket_map.rs +++ b/bucket_map/src/bucket_map.rs @@ -129,11 +129,17 @@ impl BucketMap { .unwrap_or_default() } - pub fn range(&self, ix: usize, range: Option<&R>) -> Option>> + pub fn items_in_range(&self, ix: usize, range: Option<&R>) -> Option>> where R: RangeBounds, { - Some(self.buckets[ix].read().unwrap().as_ref()?.range(range)) + Some( + self.buckets[ix] + .read() + .unwrap() + .as_ref()? + .items_in_range(range), + ) } /// Get the Pubkeys for bucket `ix` @@ -404,7 +410,7 @@ mod tests { for bin in 0..map.num_buckets() { r.append( &mut map - .range(bin, None::<&std::ops::RangeInclusive>) + .items_in_range(bin, None::<&std::ops::RangeInclusive>) .unwrap_or_default(), ); }