mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 17:44:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix TreeMap retain

Browse source
This commit is contained in:
Mikayla Maki 2023-05-03 08:39:25 -07:00
parent ae890212e3
commit 023d665fb3
No known key found for this signature in database
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/sum_tree/src/tree_map.rs
View file

@ -103,11 +103,11 @@ impl<K: Clone + Debug + Default + Ord, V: Clone + Debug> TreeMap<K, V> {
} }
pub fn retain<F: FnMut(&K, &V) -> bool>(&mut self, mut predicate: F) { pub fn retain<F: FnMut(&K, &V) -> bool>(&mut self, mut predicate: F) {
let mut cursor = self.0.cursor::<MapKeyRef<'_, K>>();
cursor.seek(&MapKeyRef(None), Bias::Left, &());
let mut new_map = SumTree::<MapEntry<K, V>>::default(); let mut new_map = SumTree::<MapEntry<K, V>>::default();
if let Some(item) = cursor.item() {
let mut cursor = self.0.cursor::<MapKeyRef<'_, K>>();
cursor.next(&());
while let Some(item) = cursor.item() {
if predicate(&item.key, &item.value) { if predicate(&item.key, &item.value) {
new_map.push(item.clone(), &()); new_map.push(item.clone(), &());
} }
@ -265,5 +265,11 @@ mod tests {
map.remove(&1); map.remove(&1);
assert_eq!(map.get(&1), None); assert_eq!(map.get(&1), None);
assert_eq!(map.iter().collect::<Vec<_>>(), vec![]); assert_eq!(map.iter().collect::<Vec<_>>(), vec![]);
map.insert(4, "d");
map.insert(5, "e");
map.insert(6, "f");
map.retain(|key, _| *key % 2 == 0);
assert_eq!(map.iter().collect::<Vec<_>>(), vec![(&4, &"d"), (&6, &"f")]);
} }
} }