util: Return early from natural_sort for equal strings (#67016)

## Summary

`compare_rel_paths_by` compares paths one component at a time. In the
default `DirectoriesFirst` mode it calls `natural_sort` on each pair of
components, including the parent directories the two paths share.
`natural_sort` walked equal strings character by character before
returning `Equal`. It now checks `a == b` first. For equal strings the
loop already returned `Equal`, so results are unchanged.

The project panel sorts its visible entries with this comparator, on a
background thread, each time it rebuilds them.

`cargo bench -p project_panel --bench sorting`, which sorts 96k entries
from a Linux checkout, in `DirectoriesFirst` mode:

| Sort order | Before | After |
|---|---|---|
| Default | 12.5 ms | 10.1 ms |
| Upper | 11.8 ms | 9.5 ms |
| Lower | 13.2 ms | 10.7 ms |
| Extension | 40.0 ms | 36.9 ms |
| Unicode | 8.4 ms | 8.3 ms |

Unicode order doesn't call `natural_sort`. `Mixed` and `FilesFirst` are
unchanged, because they go through `natural_sort_no_tiebreak`, which
already returns early for names that are equal ignoring ASCII case.

## Testing

- `cargo test -p util --lib paths` passes.
- `cargo test -p project_panel` passes.
- `./script/clippy -p util` passes.

## Self-review

- [x] I've reviewed my diff for quality, security, reliability, and
performance.
- [x] UI changes follow the
[checklist](https://zed.dev/docs/development/ui-checklist).
- [x] Tests cover the new or changed behavior.

Release Notes:

- N/A
This commit is contained in:
Parker Loflin
2026-11-16 00:02:04 +00:00
committed by GitHub
parent 6b72097302
commit 310bba2f2f
+4
View File
@@ -1055,6 +1055,10 @@ where
/// 4. For non-numeric characters, using case-insensitive comparison
/// 5. If everything is equal case-insensitively, using case-sensitive comparison as final tie-breaker
pub fn natural_sort(a: &str, b: &str) -> Ordering {
if a == b {
return Ordering::Equal;
}
let mut a_iter = a.chars().peekable();
let mut b_iter = b.chars().peekable();