Skip to content

Commit 63c8ee1

Browse files
committed
Bump version v0.3.2.
Fixed clippy lint. Updated feature gates.
1 parent bf27b8b commit 63c8ee1

File tree

5 files changed

+20
-113
lines changed

5 files changed

+20
-113
lines changed

CHANGELOG.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [0.3.2] - 2022-09-29
10+
11+
- Updated feature gates.
12+
13+
### Fixes
14+
- Fixed clippy lints.
15+
916
## [0.3.1] - 2022-09-25
1017

1118
Moved to [ink-feather-org](https://github.com/ink-feather-org/const_sort_rs).
1219

1320
### Fixes
14-
- Fixed clippy lints
21+
- Fixed clippy lints.
1522

1623
## [0.3.0] - 2022-09-22
1724

@@ -24,7 +31,8 @@ Moved to [ink-feather-org](https://github.com/ink-feather-org/const_sort_rs).
2431

2532
## [0.1.0] - 2022-09-14
2633

27-
[Unreleased]: https://github.com/ink-feather-org/const_sort_rs/compare/v0.3.1...HEAD
34+
[Unreleased]: https://github.com/ink-feather-org/const_sort_rs/compare/v0.3.2...HEAD
35+
[0.3.1]: https://github.com/ink-feather-org/const_sort_rs/compare/v0.3.1...v0.3.2
2836
[0.3.1]: https://github.com/ink-feather-org/const_sort_rs/compare/v0.3.0...v0.3.1
2937
[0.3.0]: https://github.com/ink-feather-org/const_sort_rs/compare/v0.2.1...v0.3.0
3038
[0.2.1]: https://github.com/ink-feather-org/const_sort_rs/compare/v0.2.0...v0.2.1

const_sort_rs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "const_sort_rs"
3-
version = "0.3.1"
3+
version = "0.3.2"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
authors = [

const_sort_rs/src/const_sort.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ use core::mem::{self, MaybeUninit};
1515
use core::ptr;
1616

1717
use crate::fake_usize_ptr::FakeUsizePtr;
18-
use crate::slice_const_split_at_mut::ConstSplitAtMutExtensions;
1918

2019
/// When dropped, copies from `src` into `dest`.
2120
struct CopyOnDrop<T> {
@@ -546,7 +545,7 @@ where
546545
let (mid, was_partitioned) = {
547546
// Place the pivot at the beginning of slice.
548547
v.swap(0, pivot);
549-
let (pivot, v) = v.const_split_at_mut(1);
548+
let (pivot, v) = v.split_at_mut(1);
550549
let pivot = &mut pivot[0];
551550

552551
// Read the pivot into a stack-allocated variable for efficiency. If a following comparison
@@ -606,7 +605,7 @@ where
606605
{
607606
// Place the pivot at the beginning of slice.
608607
v.swap(0, pivot);
609-
let (pivot, v) = v.const_split_at_mut(1);
608+
let (pivot, v) = v.split_at_mut(1);
610609
let pivot = &mut pivot[0];
611610

612611
// Read the pivot into a stack-allocated variable for efficiency. If a following comparison
@@ -877,8 +876,8 @@ const fn recurse<'a, T, F>(
877876
was_partitioned = was_p;
878877

879878
// Split the slice into `left`, `pivot`, and `right`.
880-
let (left, right) = v.const_split_at_mut(mid);
881-
let (pivot, right) = right.const_split_at_mut(1);
879+
let (left, right) = v.split_at_mut(mid);
880+
let (pivot, right) = right.split_at_mut(1);
882881
let pivot = &pivot[0];
883882

884883
// Recurse into the shorter side only in order to minimize the total number of recursive
@@ -957,8 +956,8 @@ const fn partition_at_index_loop<'a, T, F>(
957956
let (mid, _) = partition(v, pivot, is_less);
958957

959958
// Split the slice into `left`, `pivot`, and `right`.
960-
let (left, right) = v.const_split_at_mut(mid);
961-
let (pivot, right) = right.const_split_at_mut(1);
959+
let (left, right) = v.split_at_mut(mid);
960+
let (pivot, right) = right.split_at_mut(1);
962961
let pivot = &pivot[0];
963962

964963
if mid < index {
@@ -1026,8 +1025,8 @@ where
10261025
partition_at_index_loop(v, index, &mut is_less, None);
10271026
}
10281027

1029-
let (left, right) = v.const_split_at_mut(index);
1030-
let (pivot, right) = right.const_split_at_mut(1);
1028+
let (left, right) = v.split_at_mut(index);
1029+
let (pivot, right) = right.split_at_mut(1);
10311030
let pivot = &mut pivot[0];
10321031
(left, pivot, right)
10331032
}

const_sort_rs/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
#![feature(const_ptr_read)] // const_sort_core
1515
#![feature(const_deref)] // const_sort_core
1616
#![feature(const_reverse)] // const_sort_core
17-
#![feature(mixed_integer_ops)] // const_sort_core
17+
#![feature(const_slice_split_at_mut)] // const_sort_core
1818
#![feature(const_maybe_uninit_write)] // const_sort_core
1919
#![feature(core_intrinsics)] // const_sort_core
2020
#![feature(const_eval_select)] // const_sort_core
2121
#![feature(const_slice_index)] // const_sort_core
2222
#![feature(const_cmp)] // const_sort_core
23-
#![feature(const_slice_from_raw_parts_mut)] // slice_const_split_at_mut FIXME: Replace with const_slice_split_at_mut once it lands.
2423
#![feature(unboxed_closures)] // const_slice_sort_ext
2524
#![feature(fn_traits)] // const_slice_sort_ext
2625
// For tests
@@ -76,7 +75,6 @@ conditions.
7675
*/
7776

7877
pub(crate) mod fake_usize_ptr;
79-
pub(crate) mod slice_const_split_at_mut;
8078

8179
#[allow(
8280
clippy::undocumented_unsafe_blocks,

const_sort_rs/src/slice_const_split_at_mut.rs

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)