Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename partition_at_index to select_nth #77091

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions library/core/src/slice/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2055,12 +2055,12 @@ impl<T> [T] {
/// # Examples
///
/// ```
/// #![feature(slice_partition_at_index)]
/// #![feature(slice_select_nth_unstable)]
///
/// let mut v = [-5i32, 4, 1, -3, 2];
///
/// // Find the median
/// v.partition_at_index(2);
/// v.select_nth_unstable(2);
///
/// // We are only guaranteed the slice will be one of the following, based on the way we sort
/// // about the specified index.
Expand All @@ -2069,14 +2069,14 @@ impl<T> [T] {
/// v == [-3, -5, 1, 4, 2] ||
/// v == [-5, -3, 1, 4, 2]);
/// ```
#[unstable(feature = "slice_partition_at_index", issue = "55300")]
#[unstable(feature = "slice_select_nth_unstable", issue = "55300")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since #55300 has already been FCP'ed to stabilize, it's better just mark all methods as #[stable], wait until the FCP ends, and merge this as the stabilization PR.

#[inline]
pub fn partition_at_index(&mut self, index: usize) -> (&mut [T], &mut T, &mut [T])
pub fn select_nth_unstable(&mut self, index: usize) -> (&mut [T], &mut T, &mut [T])
where
T: Ord,
{
let mut f = |a: &T, b: &T| a.lt(b);
sort::partition_at_index(self, index, &mut f)
sort::select_nth_unstable(self, index, &mut f)
}

/// Reorder the slice with a comparator function such that the element at `index` is at its
Expand Down Expand Up @@ -2105,12 +2105,12 @@ impl<T> [T] {
/// # Examples
///
/// ```
/// #![feature(slice_partition_at_index)]
/// #![feature(slice_select_nth_unstable)]
///
/// let mut v = [-5i32, 4, 1, -3, 2];
///
/// // Find the median as if the slice were sorted in descending order.
/// v.partition_at_index_by(2, |a, b| b.cmp(a));
/// v.select_nth_unstable_by(2, |a, b| b.cmp(a));
///
/// // We are only guaranteed the slice will be one of the following, based on the way we sort
/// // about the specified index.
Expand All @@ -2119,9 +2119,9 @@ impl<T> [T] {
/// v == [4, 2, 1, -5, -3] ||
/// v == [4, 2, 1, -3, -5]);
/// ```
#[unstable(feature = "slice_partition_at_index", issue = "55300")]
#[unstable(feature = "slice_select_nth_unstable", issue = "55300")]
#[inline]
pub fn partition_at_index_by<F>(
pub fn select_nth_unstable_by<F>(
&mut self,
index: usize,
mut compare: F,
Expand All @@ -2130,7 +2130,7 @@ impl<T> [T] {
F: FnMut(&T, &T) -> Ordering,
{
let mut f = |a: &T, b: &T| compare(a, b) == Less;
sort::partition_at_index(self, index, &mut f)
sort::select_nth_unstable(self, index, &mut f)
}

/// Reorder the slice with a key extraction function such that the element at `index` is at its
Expand Down Expand Up @@ -2159,12 +2159,12 @@ impl<T> [T] {
/// # Examples
///
/// ```
/// #![feature(slice_partition_at_index)]
/// #![feature(slice_select_nth_unstable)]
///
/// let mut v = [-5i32, 4, 1, -3, 2];
///
/// // Return the median as if the array were sorted according to absolute value.
/// v.partition_at_index_by_key(2, |a| a.abs());
/// v.select_nth_unstable_by_key(2, |a| a.abs());
///
/// // We are only guaranteed the slice will be one of the following, based on the way we sort
/// // about the specified index.
Expand All @@ -2173,9 +2173,9 @@ impl<T> [T] {
/// v == [2, 1, -3, 4, -5] ||
/// v == [2, 1, -3, -5, 4]);
/// ```
#[unstable(feature = "slice_partition_at_index", issue = "55300")]
#[unstable(feature = "slice_select_nth_unstable", issue = "55300")]
#[inline]
pub fn partition_at_index_by_key<K, F>(
pub fn select_nth_unstable_by_key<K, F>(
&mut self,
index: usize,
mut f: F,
Expand All @@ -2185,7 +2185,7 @@ impl<T> [T] {
K: Ord,
{
let mut g = |a: &T, b: &T| f(a).lt(&f(b));
sort::partition_at_index(self, index, &mut g)
sort::select_nth_unstable(self, index, &mut g)
}

/// Moves all consecutive repeated elements to the end of the slice according to the
Expand Down
8 changes: 4 additions & 4 deletions library/core/src/slice/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ where
recurse(v, &mut is_less, None, limit);
}

fn partition_at_index_loop<'a, T, F>(
fn select_nth_unstable_loop<'a, T, F>(
mut v: &'a mut [T],
mut index: usize,
is_less: &mut F,
Expand Down Expand Up @@ -828,7 +828,7 @@ fn partition_at_index_loop<'a, T, F>(
}
}

pub fn partition_at_index<T, F>(
pub fn select_nth_unstable<T, F>(
v: &mut [T],
index: usize,
mut is_less: F,
Expand All @@ -840,7 +840,7 @@ where
use cmp::Ordering::Less;

if index >= v.len() {
panic!("partition_at_index index {} greater than length of slice {}", index, v.len());
panic!("select_nth_unstable index {} greater than length of slice {}", index, v.len());
}

if mem::size_of::<T>() == 0 {
Expand All @@ -864,7 +864,7 @@ where
.unwrap();
v.swap(min_index, index);
} else {
partition_at_index_loop(v, index, &mut is_less, None);
select_nth_unstable_loop(v, index, &mut is_less, None);
}

let (left, right) = v.split_at_mut(index);
Expand Down
2 changes: 1 addition & 1 deletion library/core/tests/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#![feature(pattern)]
#![feature(raw)]
#![feature(sort_internals)]
#![feature(slice_partition_at_index)]
#![feature(slice_select_nth_unstable)]
#![feature(min_specialization)]
#![feature(step_trait)]
#![feature(step_trait_ext)]
Expand Down
32 changes: 16 additions & 16 deletions library/core/tests/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ fn sort_unstable() {
#[test]
#[cfg(not(target_arch = "wasm32"))]
#[cfg_attr(miri, ignore)] // Miri is too slow
fn partition_at_index() {
fn select_nth_unstable() {
use core::cmp::Ordering::{Equal, Greater, Less};
use rand::rngs::StdRng;
use rand::seq::SliceRandom;
Expand All @@ -1596,7 +1596,7 @@ fn partition_at_index() {
// Sort in default order.
for pivot in 0..len {
let mut v = orig.clone();
v.partition_at_index(pivot);
v.select_nth_unstable(pivot);

assert_eq!(v_sorted[pivot], v[pivot]);
for i in 0..pivot {
Expand All @@ -1609,7 +1609,7 @@ fn partition_at_index() {
// Sort in ascending order.
for pivot in 0..len {
let mut v = orig.clone();
let (left, pivot, right) = v.partition_at_index_by(pivot, |a, b| a.cmp(b));
let (left, pivot, right) = v.select_nth_unstable_by(pivot, |a, b| a.cmp(b));

assert_eq!(left.len() + right.len(), len - 1);

Expand All @@ -1632,7 +1632,7 @@ fn partition_at_index() {

for pivot in 0..len {
let mut v = orig.clone();
v.partition_at_index_by(pivot, sort_descending_comparator);
v.select_nth_unstable_by(pivot, sort_descending_comparator);

assert_eq!(v_sorted_descending[pivot], v[pivot]);
for i in 0..pivot {
Expand All @@ -1653,36 +1653,36 @@ fn partition_at_index() {
}

for pivot in 0..v.len() {
v.partition_at_index_by(pivot, |_, _| *[Less, Equal, Greater].choose(&mut rng).unwrap());
v.select_nth_unstable_by(pivot, |_, _| *[Less, Equal, Greater].choose(&mut rng).unwrap());
v.sort();
for i in 0..v.len() {
assert_eq!(v[i], i as i32);
}
}

// Should not panic.
[(); 10].partition_at_index(0);
[(); 10].partition_at_index(5);
[(); 10].partition_at_index(9);
[(); 100].partition_at_index(0);
[(); 100].partition_at_index(50);
[(); 100].partition_at_index(99);
[(); 10].select_nth_unstable(0);
[(); 10].select_nth_unstable(5);
[(); 10].select_nth_unstable(9);
[(); 100].select_nth_unstable(0);
[(); 100].select_nth_unstable(50);
[(); 100].select_nth_unstable(99);

let mut v = [0xDEADBEEFu64];
v.partition_at_index(0);
v.select_nth_unstable(0);
assert!(v == [0xDEADBEEF]);
}

#[test]
#[should_panic(expected = "index 0 greater than length of slice")]
fn partition_at_index_zero_length() {
[0i32; 0].partition_at_index(0);
fn select_nth_unstable_zero_length() {
[0i32; 0].select_nth_unstable(0);
}

#[test]
#[should_panic(expected = "index 20 greater than length of slice")]
fn partition_at_index_past_length() {
[0i32; 10].partition_at_index(20);
fn select_nth_unstable_past_length() {
[0i32; 10].select_nth_unstable(20);
}

pub mod memchr {
Expand Down