Skip to content

Commit 8d704cf

Browse files
committed
Minor cleanup
1 parent dee5b35 commit 8d704cf

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

const_sort_rs/src/const_sort.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use core::ptr;
1717
use const_closure::const_closure;
1818

1919
use crate::fake_usize_ptr::FakeUsizePtr;
20-
use crate::slice_const_split_at::ConstSplitAtExtensions;
20+
use crate::slice_const_split_at_mut::ConstSplitAtMutExtensions;
2121

2222
/// When dropped, copies from `src` into `dest`.
2323
struct CopyOnDrop<T> {

const_sort_rs/src/lib.rs

+15-14
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
#![deny(missing_docs)]
33
#![deny(unsafe_op_in_unsafe_fn)]
44
#![warn(clippy::undocumented_unsafe_blocks, clippy::pedantic, clippy::nursery)]
5-
#![feature(const_refs_to_cell)]
6-
#![feature(const_trait_impl)]
7-
#![feature(const_num_from_num)]
8-
#![feature(const_option)]
9-
#![feature(const_result_drop)]
10-
#![feature(const_mut_refs)]
11-
#![feature(const_swap)]
12-
#![feature(const_cmp)] // For tests
13-
#![feature(const_slice_from_raw_parts_mut)]
5+
#![feature(const_refs_to_cell)] // const_sort_core
6+
#![feature(const_trait_impl)] // const_sort_core
7+
#![feature(const_num_from_num)] // const_sort_core
8+
#![feature(const_option)] // const_sort_core
9+
#![feature(const_mut_refs)] // const_sort_core
10+
#![feature(const_swap)] // const_sort_core
1411
#![feature(maybe_uninit_slice)] // const_sort_core
1512
#![feature(strict_provenance)] // const_sort_core
1613
#![feature(const_ptr_read)] // const_sort_core
@@ -21,10 +18,14 @@
2118
#![feature(core_intrinsics)] // const_sort_core
2219
#![feature(const_eval_select)] // const_sort_core
2320
#![feature(const_slice_index)] // const_sort_core
24-
#![feature(is_sorted)] // For tests
25-
#![feature(unboxed_closures)] // For const_slice_sort_ext
26-
#![feature(fn_traits)] // For const_slice_sort_ext
27-
//#![feature(const_ord)] TODO replace matches!
21+
#![feature(const_cmp)] // const_sort_core
22+
#![feature(const_slice_from_raw_parts_mut)] // slice_const_split_at_mut FIXME: Replace with const_slice_split_at_mut once it lands.
23+
#![feature(unboxed_closures)] // const_slice_sort_ext
24+
#![feature(fn_traits)] // const_slice_sort_ext
25+
// For tests
26+
#![feature(is_sorted)]
27+
//#![feature(const_ord)] TODO replace matches! FIXME: Once partial_eq is added to the feature.
28+
2829
/*!
2930
# const_sort_rs
3031
@@ -84,7 +85,7 @@ conditions.
8485
*/
8586

8687
pub(crate) mod fake_usize_ptr;
87-
pub(crate) mod slice_const_split_at;
88+
pub(crate) mod slice_const_split_at_mut;
8889

8990
pub mod const_sort;
9091

const_sort_rs/src/slice_const_split_at.rs renamed to const_sort_rs/src/slice_const_split_at_mut.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use core::slice;
44

55
/// FIXME: Remove once `const_slice_split_at_mut` lands.
6-
pub(crate) trait ConstSplitAtExtensions<T> {
6+
pub(crate) trait ConstSplitAtMutExtensions<T> {
77
/// Divides one mutable slice into two at an index.
88
///
99
/// The first will contain all indices from `[0, mid)` (excluding
@@ -66,14 +66,14 @@ pub(crate) trait ConstSplitAtExtensions<T> {
6666
unsafe fn const_split_at_mut_unchecked(&mut self, mid: usize) -> (&mut [T], &mut [T]);
6767
}
6868

69-
impl<T> const ConstSplitAtExtensions<T> for [T] {
69+
impl<T> const ConstSplitAtMutExtensions<T> for [T] {
7070
#[inline]
7171
#[track_caller]
7272
fn const_split_at_mut(&mut self, mid: usize) -> (&mut [T], &mut [T]) {
7373
assert!(mid <= self.len());
7474
// SAFETY: `[ptr; mid]` and `[mid; len]` are inside `self`, which
7575
// fulfils the requirements of `from_raw_parts_mut`.
76-
unsafe { ConstSplitAtExtensions::const_split_at_mut_unchecked(self, mid) }
76+
unsafe { ConstSplitAtMutExtensions::const_split_at_mut_unchecked(self, mid) }
7777
}
7878

7979
#[inline]

const_sort_rs/src/test.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
extern crate alloc;
2-
use core::cmp::Ordering;
32

43
use alloc::vec::Vec;
54
use rand::{prelude::StdRng, Rng, SeedableRng};

0 commit comments

Comments
 (0)