Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into sumtree-v10000

Browse source
This commit is contained in:
Piotr Osiewicz 2025-08-21 18:34:51 +02:00
commit 3870eeff32
1337 changed files with 50830 additions and 31728 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/sum_tree/src/cursor.rs
View file

@ -539,10 +539,10 @@ where
debug_assert!(self.stack.is_empty() || self.stack.last().unwrap().tree.0.is_leaf());
let mut end = self.position.clone();
if bias == Bias::Left {
if let Some(summary) = self.item_summary() {
end.add_summary(summary, self.cx);
}
if bias == Bias::Left
&& let Some(summary) = self.item_summary()
{
end.add_summary(summary, self.cx);
}
target.cmp(&end, self.cx) == Ordering::Equal

36
crates/sum_tree/src/sum_tree.rs
View file

@ -97,9 +97,7 @@ impl<'a, S: Summary, D: Dimension<'a, S> + Ord> SeekTarget<'a, S, D> for D {
}
impl<'a, T: Summary> Dimension<'a, T> for () {
fn zero(_: &T::Context) -> Self {
()
}
fn zero(_: &T::Context) -> Self {}
fn add_summary(&mut self, _: &'a T, _: &T::Context) {}
}
@ -712,11 +710,11 @@ impl<T: KeyedItem> SumTree<T> {
*self = {
let mut cursor = self.cursor::<T::Key>(cx);
let mut new_tree = cursor.slice(&item.key(), Bias::Left);
if let Some(cursor_item) = cursor.item() {
if cursor_item.key() == item.key() {
replaced = Some(cursor_item.clone());
cursor.next();
}
if let Some(cursor_item) = cursor.item()
&& cursor_item.key() == item.key()
{
replaced = Some(cursor_item.clone());
cursor.next();
}
new_tree.push(item, cx);
new_tree.append(cursor.suffix(), cx);
@ -730,11 +728,11 @@ impl<T: KeyedItem> SumTree<T> {
*self = {
let mut cursor = self.cursor::<T::Key>(cx);
let mut new_tree = cursor.slice(key, Bias::Left);
if let Some(item) = cursor.item() {
if item.key() == *key {
removed = Some(item.clone());
cursor.next();
}
if let Some(item) = cursor.item()
&& item.key() == *key
{
removed = Some(item.clone());
cursor.next();
}
new_tree.append(cursor.suffix(), cx);
new_tree
@ -766,7 +764,7 @@ impl<T: KeyedItem> SumTree<T> {
if old_item
.as_ref()
.map_or(false, |old_item| old_item.key() < new_key)
.is_some_and(|old_item| old_item.key() < new_key)
{
new_tree.extend(buffered_items.drain(..), cx);
let slice = cursor.slice(&new_key, Bias::Left);
@ -774,11 +772,11 @@ impl<T: KeyedItem> SumTree<T> {
old_item = cursor.item();
}
if let Some(old_item) = old_item {
if old_item.key() == new_key {
removed.push(old_item.clone());
cursor.next();
}
if let Some(old_item) = old_item
&& old_item.key() == new_key
{
removed.push(old_item.clone());
cursor.next();
}
match edit {