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

project search: Reduce clones and allocations (#31133)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Remco Smits 2025-05-22 04:11:00 +02:00 • committed by GitHub
parent 5f452dbca2
commit dce22a965e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/project/src/project.rs
View file

@ -3662,9 +3662,8 @@ impl Project {
// ranges in the buffer matched by the query. // ranges in the buffer matched by the query.
let mut chunks = pin!(chunks); let mut chunks = pin!(chunks);
'outer: while let Some(matching_buffer_chunk) = chunks.next().await { 'outer: while let Some(matching_buffer_chunk) = chunks.next().await {
let mut chunk_results = Vec::new(); let mut chunk_results = Vec::with_capacity(matching_buffer_chunk.len());
for buffer in matching_buffer_chunk { for buffer in matching_buffer_chunk {
let buffer = buffer.clone();
let query = query.clone(); let query = query.clone();
let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?; let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
chunk_results.push(cx.background_spawn(async move { chunk_results.push(cx.background_spawn(async move {

10
crates/search/src/project_search.rs
View file

@ -324,11 +324,9 @@ impl ProjectSearch {
} }
} }
let excerpts = project_search let mut new_ranges = project_search
.update(cx, |project_search, _| project_search.excerpts.clone()) .update(cx, |project_search, cx| {
.ok()?; project_search.excerpts.update(cx, |excerpts, cx| {
let mut new_ranges = excerpts
.update(cx, |excerpts, cx| {
buffers_with_ranges buffers_with_ranges
.into_iter() .into_iter()
.map(|(buffer, ranges)| { .map(|(buffer, ranges)| {
@ -341,7 +339,9 @@ impl ProjectSearch {
}) })
.collect::<FuturesOrdered<_>>() .collect::<FuturesOrdered<_>>()
}) })
})
.ok()?; .ok()?;
while let Some(new_ranges) = new_ranges.next().await { while let Some(new_ranges) = new_ranges.next().await {
project_search project_search
.update(cx, |project_search, _| { .update(cx, |project_search, _| {