mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove debug unused

Browse Source
This commit is contained in:
Lukas Bergdoll 2022-11-21 14:20:31 +01:00
parent dbc0ed2a10
commit 1ec59cdcd1
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
library/core/src/slice/sort.rs
View File

@ -9,8 +9,6 @@
//! In addition it also contains the core logic of the stable sort used by `slice::sort` based on //! In addition it also contains the core logic of the stable sort used by `slice::sort` based on
//! TimSort. //! TimSort.
#![allow(unused)] // FIXME debug
use crate::cmp; use crate::cmp;
use crate::mem::{self, MaybeUninit, SizedTypeProperties}; use crate::mem::{self, MaybeUninit, SizedTypeProperties};
use crate::ptr; use crate::ptr;
@ -1167,7 +1165,7 @@ pub fn merge_sort<T, CmpF, ElemAllocF, ElemDeallocF, RunAllocF, RunDeallocF>(
// shallow copies of the contents of `v` without risking the dtors running on copies if // shallow copies of the contents of `v` without risking the dtors running on copies if
// `is_less` panics. When merging two sorted runs, this buffer holds a copy of the shorter run, // `is_less` panics. When merging two sorted runs, this buffer holds a copy of the shorter run,
// which will always have length at most `len / 2`. // which will always have length at most `len / 2`.
let mut buf = BufGuard::new(len / 2, elem_alloc_fn, elem_dealloc_fn); let buf = BufGuard::new(len / 2, elem_alloc_fn, elem_dealloc_fn);
let buf_ptr = buf.buf_ptr; let buf_ptr = buf.buf_ptr;
let mut runs = RunVec::new(run_alloc_fn, run_dealloc_fn); let mut runs = RunVec::new(run_alloc_fn, run_dealloc_fn);
@ -1255,30 +1253,33 @@ pub fn merge_sort<T, CmpF, ElemAllocF, ElemDeallocF, RunAllocF, RunDeallocF>(
// Extremely basic versions of Vec. // Extremely basic versions of Vec.
// Their use is super limited and by having the code here, it allows reuse between the sort // Their use is super limited and by having the code here, it allows reuse between the sort
// implementations. // implementations.
struct BufGuard<T, ElemAllocF, ElemDeallocF> struct BufGuard<T, ElemDeallocF>
where where
ElemAllocF: Fn(usize) -> *mut T,
ElemDeallocF: Fn(*mut T, usize), ElemDeallocF: Fn(*mut T, usize),
{ {
buf_ptr: *mut T, buf_ptr: *mut T,
capacity: usize, capacity: usize,
elem_alloc_fn: ElemAllocF,
elem_dealloc_fn: ElemDeallocF, elem_dealloc_fn: ElemDeallocF,
} }
impl<T, ElemAllocF, ElemDeallocF> BufGuard<T, ElemAllocF, ElemDeallocF> impl<T, ElemDeallocF> BufGuard<T, ElemDeallocF>
where where
ElemAllocF: Fn(usize) -> *mut T,
ElemDeallocF: Fn(*mut T, usize), ElemDeallocF: Fn(*mut T, usize),
{ {
fn new(len: usize, elem_alloc_fn: ElemAllocF, elem_dealloc_fn: ElemDeallocF) -> Self { fn new<ElemAllocF>(
Self { buf_ptr: elem_alloc_fn(len), capacity: len, elem_alloc_fn, elem_dealloc_fn } len: usize,
elem_alloc_fn: ElemAllocF,
elem_dealloc_fn: ElemDeallocF,
) -> Self
where
ElemAllocF: Fn(usize) -> *mut T,
{
Self { buf_ptr: elem_alloc_fn(len), capacity: len, elem_dealloc_fn }
} }
} }
impl<T, ElemAllocF, ElemDeallocF> Drop for BufGuard<T, ElemAllocF, ElemDeallocF> impl<T, ElemDeallocF> Drop for BufGuard<T, ElemDeallocF>
where where
ElemAllocF: Fn(usize) -> *mut T,
ElemDeallocF: Fn(*mut T, usize), ElemDeallocF: Fn(*mut T, usize),
{ {
fn drop(&mut self) { fn drop(&mut self) {