Skip to content

Commit f140a6c

Browse files
committed
Auto merge of #39642 - stjepang:specialize-slice-partialord, r=alexcrichton
Specialize `PartialOrd<A> for [A] where A: Ord` This way we can call `cmp` instead of `partial_cmp` in the loop, removing some burden of optimizing `Option`s away from the compiler. PR #39538 introduced a regression where sorting slices suddenly became slower, since `slice1.lt(slice2)` was much slower than `slice1.cmp(slice2) == Less`. This problem is now fixed. To verify, I benchmarked this simple program: ```rust fn main() { let mut v = (0..2_000_000).map(|x| x * x * x * 18913515181).map(|x| vec![x, x ^ 3137831591]).collect::<Vec<_>>(); v.sort(); } ``` Before this PR, it would take 0.95 sec, and now it takes 0.58 sec. I also tried changing the `is_less` lambda to use `cmp` and `partial_cmp`. Now all three versions (`lt`, `cmp`, `partial_cmp`) are equally performant for sorting slices - all of them take 0.58 sec on the benchmark. Tangentially, as soon as we get `default impl`, it might be a good idea to implement a blanket default impl for `lt`, `gt`, `le`, `ge` in terms of `cmp` whenever possible. Today, those four functions by default are only implemented in terms of `partial_cmp`. r? @alexcrichton
2 parents 064a0ee + a344c12 commit f140a6c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/libcore/slice.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -2290,9 +2290,10 @@ impl<A> SlicePartialOrd<A> for [A]
22902290
}
22912291
}
22922292

2293-
impl SlicePartialOrd<u8> for [u8] {
2294-
#[inline]
2295-
fn partial_compare(&self, other: &[u8]) -> Option<Ordering> {
2293+
impl<A> SlicePartialOrd<A> for [A]
2294+
where A: Ord
2295+
{
2296+
default fn partial_compare(&self, other: &[A]) -> Option<Ordering> {
22962297
Some(SliceOrd::compare(self, other))
22972298
}
22982299
}

0 commit comments

Comments
 (0)