oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove add_summary_with_ctx and always require a ctx in add_summary

Browse Source
This commit is contained in:
Antonio Scandurra
2021-05-06 16:57:47 +02:00
parent 901525bf77
commit 652fc9e4ec
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zed/src/sum_tree/cursor.rs
+2 -2
View File
@@ -560,7 +560,7 @@ where
slice_items_summary
.as_mut()
.unwrap()
.add_summary_with_ctx(item_summary, ctx);
.add_summary(item_summary, ctx);
}
SeekAggregate::Summary(summary) => {
summary.add_summary(item_summary);
@@ -679,7 +679,7 @@ where
slice_items_summary
.as_mut()
.unwrap()
.add_summary_with_ctx(item_summary, ctx);
.add_summary(item_summary, ctx);
slice_item_summaries.push(item_summary.clone());
}
SeekAggregate::Summary(summary) => {
zed/src/sum_tree/mod.rs
+13 -13
View File
@@ -25,14 +25,7 @@ pub trait KeyedItem: Item {
pub trait Summary: Default + Clone + fmt::Debug {
type Context;
fn add_summary(&mut self, _summary: &Self) {
unimplemented!();
}
fn add_summary_with_ctx(&mut self, summary: &Self, ctx: Option<&Self::Context>) {
assert!(ctx.is_none());
self.add_summary(summary);
}
fn add_summary(&mut self, summary: &Self, ctx: Option<&Self::Context>);
}
pub trait Dimension<'a, S: Summary>: Clone + fmt::Debug + Default {
@@ -134,6 +127,13 @@ impl<T: Item> SumTree<T> {
}
pub fn extend<I>(&mut self, iter: I)
where
I: IntoIterator<Item = T>,
{
self.extend_with_ctx(iter, None)
}
pub fn extend_with_ctx<I>(&mut self, iter: I, ctx: Option<&<T::Summary as Summary>::Context>)
where
I: IntoIterator<Item = T>,
{
@@ -159,7 +159,7 @@ impl<T: Item> SumTree<T> {
}) = leaf.as_mut()
{
let item_summary = item.summary();
summary.add_summary(&item_summary);
summary.add_summary(&item_summary, ctx);
items.push(item);
item_summaries.push(item_summary);
} else {
@@ -226,7 +226,7 @@ impl<T: Item> SumTree<T> {
..
} => {
let other_node = other.0.clone();
summary.add_summary_with_ctx(other_node.summary(), ctx);
summary.add_summary(other_node.summary(), ctx);
let height_delta = *height - other_node.height();
let mut summaries_to_append = ArrayVec::<[T::Summary; 2 * TREE_BASE]>::new();
@@ -323,7 +323,7 @@ impl<T: Item> SumTree<T> {
item_summaries: right_summaries,
})))
} else {
summary.add_summary_with_ctx(other_node.summary(), ctx);
summary.add_summary(other_node.summary(), ctx);
items.extend(other_node.items().iter().cloned());
item_summaries.extend(other_node.child_summaries().iter().cloned());
None
@@ -538,7 +538,7 @@ where
{
let mut sum = T::default();
for value in iter {
sum.add_summary_with_ctx(value, ctx);
sum.add_summary(value, ctx);
}
sum
}
@@ -889,7 +889,7 @@ mod tests {
impl Summary for IntegersSummary {
type Context = ();
fn add_summary(&mut self, other: &Self) {
fn add_summary(&mut self, other: &Self, _: Option<&Self::Context>) {
self.count.0 += &other.count.0;
self.sum.0 += &other.sum.0;
self.contains_even |= other.contains_even;