Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Use unstable sorts before deduplication (#63199)

Miguel Raz Guzmán Macedof42c6e873eee
diff --git a/crates/edit_prediction_context/src/edit_prediction_context.rs b/crates/edit_prediction_context/src/edit_prediction_context.rs
index d2be8f2ce6a..3461e6d3415 100644
--- a/crates/edit_prediction_context/src/edit_prediction_context.rs
+++ b/crates/edit_prediction_context/src/edit_prediction_context.rs
@@ -648,7 +648,7 @@ fn identifiers_for_position(
}
}
- ranges.sort_by(|a, b| a.start.cmp(&b.start).then(b.end.cmp(&a.end)));
+ ranges.sort_unstable_by(|a, b| a.start.cmp(&b.start).then(b.end.cmp(&a.end)));
ranges.dedup_by(|a, b| {
if a.start <= b.end {
b.start = b.start.min(a.start);
diff --git a/crates/editor/src/bookmarks.rs b/crates/editor/src/bookmarks.rs
index c28db615cde..bcfaafe78e2 100644
--- a/crates/editor/src/bookmarks.rs
+++ b/crates/editor/src/bookmarks.rs
@@ -76,7 +76,7 @@ impl Editor {
let multi_buffer_snapshot = snapshot.buffer_snapshot();
let mut selections = self.selections.all::<Point>(&snapshot.display_snapshot);
- selections.sort_by_key(|s| s.head());
+ selections.sort_unstable_by_key(|s| s.head());
selections.dedup_by_key(|s| s.head().row);
let mut exist_targets: Vec<BookmarkTarget> = vec![];
diff --git a/crates/git/src/status.rs b/crates/git/src/status.rs
index 28178bfaedd..7a993686011 100644
--- a/crates/git/src/status.rs
+++ b/crates/git/src/status.rs
@@ -607,7 +607,7 @@ pub fn parse_numstat(output: &str) -> GitDiffStat {
};
entries.push((path, DiffStat { added, deleted }));
}
- entries.sort_by(|(a, _), (b, _)| a.cmp(b));
+ entries.sort_unstable_by(|(a, _), (b, _)| a.cmp(b));
entries.dedup_by(|(a, _), (b, _)| a == b);
GitDiffStat {
diff --git a/crates/language/src/buffer/bracket_ranges.rs b/crates/language/src/buffer/bracket_ranges.rs
index fe38e9a034a..d4e257d2ffd 100644
--- a/crates/language/src/buffer/bracket_ranges.rs
+++ b/crates/language/src/buffer/bracket_ranges.rs
@@ -817,7 +817,7 @@ impl<'a> ChunkBrackets<'a> {
})
.collect::<Vec<_>>();
- opens.sort_by_key(|r| (r.start, r.end));
+ opens.sort_unstable_by_key(|r| (r.start, r.end));
opens.dedup_by(|a, b| a.start == b.start && a.end == b.end);
color_pairs.sort_by_key(|(_, close, _)| close.end);
diff --git a/crates/language_tools/src/lsp_log_view.rs b/crates/language_tools/src/lsp_log_view.rs
index 70ddf2aa087..ace4a0da962 100644
--- a/crates/language_tools/src/lsp_log_view.rs
+++ b/crates/language_tools/src/lsp_log_view.rs
@@ -439,7 +439,7 @@ impl LspLogView {
}),
)
.collect::<Vec<_>>();
- rows.sort_by_key(|row| row.server_id);
+ rows.sort_unstable_by_key(|row| row.server_id);
rows.dedup_by_key(|row| row.server_id);
Some(rows)
}
diff --git a/crates/migrator/src/migrator.rs b/crates/migrator/src/migrator.rs
index 7b2dc972d8a..97c0c79ef0b 100644
--- a/crates/migrator/src/migrator.rs
+++ b/crates/migrator/src/migrator.rs
@@ -42,7 +42,7 @@ fn migrate(text: &str, patterns: MigrationPatterns, query: &Query) -> Result<Opt
}
}
- edits.sort_by_key(|(range, _)| (range.start, Reverse(range.end)));
+ edits.sort_unstable_by_key(|(range, _)| (range.start, Reverse(range.end)));
edits.dedup_by(|(range_b, _), (range_a, _)| {
range_a.contains(&range_b.start) || range_a.contains(&range_b.end)
});