Rollup merge of #58074 - scottmcm:stabilize-sort_by_cached_key, r=SimonSapin
Stabilize slice_sort_by_cached_key I was going to ask on the tracking issue (https://github.com/rust-lang/rust/issues/34447), but decided to just send this and hope for an FCP here. The method was added last March by https://github.com/rust-lang/rust/pull/48639. Signature: https://doc.rust-lang.org/std/primitive.slice.html#method.sort_by_cached_key ```rust impl [T] { pub fn sort_by_cached_key<K, F>(&mut self, f: F) where F: FnMut(&T) -> K, K: Ord; } ``` That's an identical signature to the existing `sort_by_key`, so I think the questions are just naming, implementation, and the usual "do we want this?". The implementation seems to have proven its use in rustc at least, which many uses: https://github.com/rust-lang/rust/search?l=Rust&q=sort_by_cached_key (I'm asking because it's exactly what I just needed the other day: ```rust all_positions.sort_by_cached_key(|&n| data::CITIES.iter() .map(|x| *metric_closure.get_edge(n, x.pos).unwrap()) .sum::<usize>() ); ``` since caching that key is a pretty obviously good idea.) Closes #34447
This commit is contained in:
@@ -1,5 +1,4 @@
|
|||||||
#![feature(repr_simd)]
|
#![feature(repr_simd)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(test)]
|
#![feature(test)]
|
||||||
|
|
||||||
extern crate rand;
|
extern crate rand;
|
||||||
|
|||||||
@@ -257,6 +257,10 @@ impl<T> [T] {
|
|||||||
/// This sort is stable (i.e., does not reorder equal elements) and `O(m n log(m n))`
|
/// This sort is stable (i.e., does not reorder equal elements) and `O(m n log(m n))`
|
||||||
/// worst-case, where the key function is `O(m)`.
|
/// worst-case, where the key function is `O(m)`.
|
||||||
///
|
///
|
||||||
|
/// For expensive key functions (e.g. functions that are not simple property accesses or
|
||||||
|
/// basic operations), [`sort_by_cached_key`](#method.sort_by_cached_key) is likely to be
|
||||||
|
/// significantly faster, as it does not recompute element keys.
|
||||||
|
///
|
||||||
/// When applicable, unstable sorting is preferred because it is generally faster than stable
|
/// When applicable, unstable sorting is preferred because it is generally faster than stable
|
||||||
/// sorting and it doesn't allocate auxiliary memory.
|
/// sorting and it doesn't allocate auxiliary memory.
|
||||||
/// See [`sort_unstable_by_key`](#method.sort_unstable_by_key).
|
/// See [`sort_unstable_by_key`](#method.sort_unstable_by_key).
|
||||||
@@ -312,7 +316,6 @@ impl<T> [T] {
|
|||||||
/// # Examples
|
/// # Examples
|
||||||
///
|
///
|
||||||
/// ```
|
/// ```
|
||||||
/// #![feature(slice_sort_by_cached_key)]
|
|
||||||
/// let mut v = [-5i32, 4, 32, -3, 2];
|
/// let mut v = [-5i32, 4, 32, -3, 2];
|
||||||
///
|
///
|
||||||
/// v.sort_by_cached_key(|k| k.to_string());
|
/// v.sort_by_cached_key(|k| k.to_string());
|
||||||
@@ -320,7 +323,7 @@ impl<T> [T] {
|
|||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// [pdqsort]: https://github.com/orlp/pdqsort
|
/// [pdqsort]: https://github.com/orlp/pdqsort
|
||||||
#[unstable(feature = "slice_sort_by_cached_key", issue = "34447")]
|
#[stable(feature = "slice_sort_by_cached_key", since = "1.34.0")]
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn sort_by_cached_key<K, F>(&mut self, f: F)
|
pub fn sort_by_cached_key<K, F>(&mut self, f: F)
|
||||||
where F: FnMut(&T) -> K, K: Ord
|
where F: FnMut(&T) -> K, K: Ord
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
#![feature(exact_size_is_empty)]
|
#![feature(exact_size_is_empty)]
|
||||||
#![feature(pattern)]
|
#![feature(pattern)]
|
||||||
#![feature(repeat_generic_slice)]
|
#![feature(repeat_generic_slice)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(try_reserve)]
|
#![feature(try_reserve)]
|
||||||
#![feature(unboxed_closures)]
|
#![feature(unboxed_closures)]
|
||||||
#![feature(vecdeque_rotate)]
|
#![feature(vecdeque_rotate)]
|
||||||
|
|||||||
@@ -1563,6 +1563,10 @@ impl<T> [T] {
|
|||||||
/// randomization to avoid degenerate cases, but with a fixed seed to always provide
|
/// randomization to avoid degenerate cases, but with a fixed seed to always provide
|
||||||
/// deterministic behavior.
|
/// deterministic behavior.
|
||||||
///
|
///
|
||||||
|
/// Due to its key calling strategy, [`sort_unstable_by_key`](#method.sort_unstable_by_key)
|
||||||
|
/// is likely to be slower than [`sort_by_cached_key`](#method.sort_by_cached_key) in
|
||||||
|
/// cases where the key function is expensive.
|
||||||
|
///
|
||||||
/// # Examples
|
/// # Examples
|
||||||
///
|
///
|
||||||
/// ```
|
/// ```
|
||||||
|
|||||||
@@ -47,7 +47,6 @@
|
|||||||
#![feature(rustc_diagnostic_macros)]
|
#![feature(rustc_diagnostic_macros)]
|
||||||
#![feature(rustc_attrs)]
|
#![feature(rustc_attrs)]
|
||||||
#![feature(slice_patterns)]
|
#![feature(slice_patterns)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(specialization)]
|
#![feature(specialization)]
|
||||||
#![feature(unboxed_closures)]
|
#![feature(unboxed_closures)]
|
||||||
#![feature(thread_local)]
|
#![feature(thread_local)]
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
#![feature(range_contains)]
|
#![feature(range_contains)]
|
||||||
#![feature(rustc_diagnostic_macros)]
|
#![feature(rustc_diagnostic_macros)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(optin_builtin_traits)]
|
#![feature(optin_builtin_traits)]
|
||||||
#![feature(concat_idents)]
|
#![feature(concat_idents)]
|
||||||
#![feature(link_args)]
|
#![feature(link_args)]
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#![feature(libc)]
|
#![feature(libc)]
|
||||||
#![feature(rustc_diagnostic_macros)]
|
#![feature(rustc_diagnostic_macros)]
|
||||||
#![feature(in_band_lifetimes)]
|
#![feature(in_band_lifetimes)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
#![allow(unused_attributes)]
|
#![allow(unused_attributes)]
|
||||||
#![allow(dead_code)]
|
#![allow(dead_code)]
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#![cfg_attr(unix, feature(libc))]
|
#![cfg_attr(unix, feature(libc))]
|
||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
#![feature(rustc_diagnostic_macros)]
|
#![feature(rustc_diagnostic_macros)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(set_stdio)]
|
#![feature(set_stdio)]
|
||||||
#![feature(no_debug)]
|
#![feature(no_debug)]
|
||||||
#![feature(integer_atomics)]
|
#![feature(integer_atomics)]
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#![feature(proc_macro_internals)]
|
#![feature(proc_macro_internals)]
|
||||||
#![feature(proc_macro_quote)]
|
#![feature(proc_macro_quote)]
|
||||||
#![feature(rustc_diagnostic_macros)]
|
#![feature(rustc_diagnostic_macros)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(crate_visibility_modifier)]
|
#![feature(crate_visibility_modifier)]
|
||||||
#![feature(specialization)]
|
#![feature(specialization)]
|
||||||
#![feature(rustc_private)]
|
#![feature(rustc_private)]
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
|
|||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
#![feature(in_band_lifetimes)]
|
#![feature(in_band_lifetimes)]
|
||||||
#![feature(slice_patterns)]
|
#![feature(slice_patterns)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(box_patterns)]
|
#![feature(box_patterns)]
|
||||||
#![feature(box_syntax)]
|
#![feature(box_syntax)]
|
||||||
#![feature(crate_visibility_modifier)]
|
#![feature(crate_visibility_modifier)]
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
#![feature(label_break_value)]
|
#![feature(label_break_value)]
|
||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
#![feature(rustc_diagnostic_macros)]
|
#![feature(rustc_diagnostic_macros)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
|
|
||||||
#![recursion_limit="256"]
|
#![recursion_limit="256"]
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,6 @@ This API is completely unstable and subject to change.
|
|||||||
#![feature(refcell_replace_swap)]
|
#![feature(refcell_replace_swap)]
|
||||||
#![feature(rustc_diagnostic_macros)]
|
#![feature(rustc_diagnostic_macros)]
|
||||||
#![feature(slice_patterns)]
|
#![feature(slice_patterns)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(never_type)]
|
#![feature(never_type)]
|
||||||
|
|
||||||
#![recursion_limit="256"]
|
#![recursion_limit="256"]
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
#![feature(box_syntax)]
|
#![feature(box_syntax)]
|
||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
#![feature(set_stdio)]
|
#![feature(set_stdio)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(test)]
|
#![feature(test)]
|
||||||
#![feature(vec_remove_item)]
|
#![feature(vec_remove_item)]
|
||||||
#![feature(ptr_offset_from)]
|
#![feature(ptr_offset_from)]
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
#![feature(nll)]
|
#![feature(nll)]
|
||||||
#![feature(rustc_attrs)]
|
#![feature(rustc_attrs)]
|
||||||
#![feature(rustc_diagnostic_macros)]
|
#![feature(rustc_diagnostic_macros)]
|
||||||
#![feature(slice_sort_by_cached_key)]
|
|
||||||
#![feature(step_trait)]
|
#![feature(step_trait)]
|
||||||
#![feature(try_trait)]
|
#![feature(try_trait)]
|
||||||
#![feature(unicode_internals)]
|
#![feature(unicode_internals)]
|
||||||
|
|||||||
Reference in New Issue
Block a user