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

Pass Summary::Context to Item::summarize (#18510)

Browse source 
We are going to use this in the multi-buffer to produce a summary for an
`Excerpt` that contains a `Range<Anchor>`.

Release Notes:

- N/A

Co-authored-by: Nathan <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2024-09-29 10:30:48 -06:00 • committed by GitHub
parent 8aeab4800c
commit 84ce81caf1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ pub const TREE_BASE: usize = 6;
pub trait Item: Clone {
type Summary: Summary;
fn summary(&self) -> Self::Summary;
fn summary(&self, cx: &<Self::Summary as Summary>::Context) -> Self::Summary;
}
/// An [`Item`] whose summary has a specific key that can be used to identify it
@ -211,7 +211,7 @@ impl<T: Item> SumTree<T> {
while iter.peek().is_some() {
let items: ArrayVec<T, { 2 * TREE_BASE }> = iter.by_ref().take(2 * TREE_BASE).collect();
let item_summaries: ArrayVec<T::Summary, { 2 * TREE_BASE }> =
items.iter().map(|item| item.summary()).collect();
items.iter().map(|item| item.summary(cx)).collect();
let mut summary = item_summaries[0].clone();
for item_summary in &item_summaries[1..] {
@ -281,7 +281,7 @@ impl<T: Item> SumTree<T> {
.map(|items| {
let items: ArrayVec<T, { 2 * TREE_BASE }> = items.into_iter().collect();
let item_summaries: ArrayVec<T::Summary, { 2 * TREE_BASE }> =
items.iter().map(|item| item.summary()).collect();
items.iter().map(|item| item.summary(cx)).collect();
let mut summary = item_summaries[0].clone();
for item_summary in &item_summaries[1..] {
<T::Summary as Summary>::add_summary(&mut summary, item_summary, cx);
@ -405,7 +405,7 @@ impl<T: Item> SumTree<T> {
if let Some((item, item_summary)) = items.last_mut().zip(item_summaries.last_mut())
{
(f)(item);
*item_summary = item.summary();
*item_summary = item.summary(cx);
*summary = sum(item_summaries.iter(), cx);
Some(summary.clone())
} else {
@ -461,7 +461,7 @@ impl<T: Item> SumTree<T> {
}
pub fn push(&mut self, item: T, cx: &<T::Summary as Summary>::Context) {
let summary = item.summary();
let summary = item.summary(cx);
self.append(
SumTree(Arc::new(Node::Leaf {
summary: summary.clone(),
@ -1352,7 +1352,7 @@ mod tests {
impl Item for u8 {
type Summary = IntegersSummary;
fn summary(&self) -> Self::Summary {
fn summary(&self, _cx: &()) -> Self::Summary {
IntegersSummary {
count: 1,
sum: *self as usize,

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

@ -224,7 +224,7 @@ where
{
type Summary = MapKey<K>;
fn summary(&self) -> Self::Summary {
fn summary(&self, _cx: &()) -> Self::Summary {
self.key()
}
}