sum_tree: Replace rayon with futures (#41586)

Release Notes:

- N/A *or* Added/Fixed/Improved ...

Co-authored by: Kate <kate@zed.dev>
This commit is contained in:
Lukas Wirth
2025-10-31 10:39:01 +00:00
committed by GitHub
parent 7c29c6d7a6
commit f2ce06c7b0
67 changed files with 1271 additions and 640 deletions
+6 -3
View File
@@ -170,7 +170,10 @@ impl CommitView {
ReplicaId::LOCAL,
cx.entity_id().as_non_zero_u64().into(),
LineEnding::default(),
format_commit(&commit, stash.is_some()).into(),
Rope::from_str(
&format_commit(&commit, stash.is_some()),
cx.background_executor(),
),
);
metadata_buffer_id = Some(buffer.remote_id());
Buffer::build(buffer, Some(file.clone()), Capability::ReadWrite)
@@ -336,7 +339,7 @@ async fn build_buffer(
) -> Result<Entity<Buffer>> {
let line_ending = LineEnding::detect(&text);
LineEnding::normalize(&mut text);
let text = Rope::from(text);
let text = Rope::from_str(&text, cx.background_executor());
let language = cx.update(|cx| language_registry.language_for_file(&blob, Some(&text), cx))?;
let language = if let Some(language) = language {
language_registry
@@ -376,7 +379,7 @@ async fn build_buffer_diff(
let base_buffer = cx
.update(|cx| {
Buffer::build_snapshot(
old_text.as_deref().unwrap_or("").into(),
Rope::from_str(old_text.as_deref().unwrap_or(""), cx.background_executor()),
buffer.language().cloned(),
Some(language_registry.clone()),
cx,
+5 -6
View File
@@ -359,6 +359,7 @@ mod tests {
use super::*;
use editor::test::editor_test_context::assert_state_with_diff;
use gpui::TestAppContext;
use language::Rope;
use project::{FakeFs, Fs, Project};
use settings::SettingsStore;
use std::path::PathBuf;
@@ -429,7 +430,7 @@ mod tests {
// Modify the new file on disk
fs.save(
path!("/test/new_file.txt").as_ref(),
&unindent(
&Rope::from_str_small(&unindent(
"
new line 1
line 2
@@ -437,8 +438,7 @@ mod tests {
line 4
new line 5
",
)
.into(),
)),
Default::default(),
)
.await
@@ -465,15 +465,14 @@ mod tests {
// Modify the old file on disk
fs.save(
path!("/test/old_file.txt").as_ref(),
&unindent(
&Rope::from_str_small(&unindent(
"
new line 1
line 2
old line 3
line 4
",
)
.into(),
)),
Default::default(),
)
.await