diff --git a/bucket_map/src/bucket.rs b/bucket_map/src/bucket.rs index 5d3bc91c53..d5545ab063 100644 --- a/bucket_map/src/bucket.rs +++ b/bucket_map/src/bucket.rs @@ -1,4 +1,4 @@ -use crate::bucket_map::{BucketMapError, BucketMapKeyValue, MaxSearch, RefCount}; +use crate::bucket_map::{BucketItem, BucketMapError, MaxSearch, RefCount}; use crate::data_bucket::{BucketMapStats, DataBucket}; use crate::index_entry::IndexEntry; use rand::thread_rng; @@ -65,7 +65,7 @@ impl Bucket { rv } - pub fn range(&self, range: Option<&R>) -> Vec> + pub fn range(&self, range: Option<&R>) -> Vec> where R: RangeBounds, { @@ -79,7 +79,7 @@ impl Bucket { let key = ix.key; if range.map(|r| r.contains(&key)).unwrap_or(true) { let val = ix.read_value(self); - result.push(BucketMapKeyValue { + result.push(BucketItem { pubkey: key, ref_count: ix.ref_count(), slot_list: val.map(|(v, _ref_count)| v.to_vec()).unwrap_or_default(), diff --git a/bucket_map/src/bucket_map.rs b/bucket_map/src/bucket_map.rs index 49de7d8d51..2402261caf 100644 --- a/bucket_map/src/bucket_map.rs +++ b/bucket_map/src/bucket_map.rs @@ -16,7 +16,7 @@ pub type MaxSearch = u8; pub type RefCount = u64; #[derive(Debug, Default, Clone)] -pub struct BucketMapKeyValue { +pub struct BucketItem { pub pubkey: Pubkey, pub ref_count: RefCount, pub slot_list: Vec, @@ -129,7 +129,7 @@ impl BucketMap { .unwrap_or_default() } - pub fn range(&self, ix: usize, range: Option<&R>) -> Option>> + pub fn range(&self, ix: usize, range: Option<&R>) -> Option>> where R: RangeBounds, {