gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to Rust v1.49.0

Browse Source
This commit is contained in:
Michael Vines
2021-01-23 11:55:15 -08:00
parent 7604edb16f
commit cbffab7850
36 changed files with 156 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/src/bloom.rs
View File

@@ -196,14 +196,18 @@ impl<T: BloomHashIndex> AtomicBloom<T> {
}
}
impl<T: BloomHashIndex> Into<Bloom<T>> for AtomicBloom<T> {
fn into(self) -> Bloom<T> {
let bits: Vec<_> = self.bits.into_iter().map(AtomicU64::into_inner).collect();
impl<T: BloomHashIndex> From<AtomicBloom<T>> for Bloom<T> {
fn from(atomic_bloom: AtomicBloom<T>) -> Self {
let bits: Vec<_> = atomic_bloom
.bits
.into_iter()
.map(AtomicU64::into_inner)
.collect();
let num_bits_set = bits.iter().map(|x| x.count_ones() as u64).sum();
let mut bits: BitVec<u64> = bits.into();
bits.truncate(self.num_bits);
bits.truncate(atomic_bloom.num_bits);
Bloom {
keys: self.keys,
keys: atomic_bloom.keys,
bits,
num_bits_set,
_phantom: PhantomData::default(),