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

Remove unsafe code #1

Merged
merged 2 commits into from
Nov 26, 2019
Merged
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
29 changes: 5 additions & 24 deletions src/construct/sacak/sacak_u32s/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,7 @@ fn sort_lms_suffixes(s: &[u32], sa: &mut [u32]) {
sa[q] = tmp;
} else {
let t = q + 1 - m;
unsafe {
std::ptr::copy(
&sa[l] as *const u32,
&mut sa[t] as *mut u32,
m,
);
}
sa.copy_within(l..l+m, t);
sa[l..Ord::min(r, t)].iter_mut().for_each(|i| *i = EMPTY);
}

Expand Down Expand Up @@ -329,13 +323,7 @@ fn finish_head(sa: &mut [u32]) {
for p in 1..sa.len() {
if sa[p] > EMPTY {
let n = -(sa[p] as i32) as usize;
unsafe {
std::ptr::copy(
&sa[p + 1] as *const u32,
&mut sa[p] as *mut u32,
n,
);
}
sa.copy_within(p+1..p+n+1, p);
sa[p + n] = EMPTY;
}
}
Expand All @@ -347,13 +335,7 @@ fn finish_tail(sa: &mut [u32]) {
for p in (1..sa.len()).rev() {
if sa[p] > EMPTY {
let n = -(sa[p] as i32) as usize;
unsafe {
std::ptr::copy(
&sa[p - n] as *const u32,
&mut sa[p - n + 1] as *mut u32,
n,
);
}
sa.copy_within(p-n..p, p-n+1);
sa[p - n] = EMPTY;
}
}
Expand All @@ -367,9 +349,8 @@ fn sa_move(
n: usize,
ptr: &mut Option<&mut usize>,
) {
unsafe {
std::ptr::copy(&sa[src] as *const u32, &mut sa[dst] as *mut u32, n);
}
sa.copy_within(src..src+n, dst);

if let Some(p) = std::mem::replace(ptr, None) {
if *p >= src && *p < src + n {
if dst >= src {
Expand Down
17 changes: 3 additions & 14 deletions src/construct/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,7 @@ pub fn suffixes_from_substrs<'s, T, F>(
// 2. sort lms suffixes
if k + 1 == tail.len() {
// lms substrings => lms suffixes
unsafe {
std::ptr::copy_nonoverlapping(
&tail[0] as *const u32,
&mut head[0] as *mut u32,
tail.len(),
);
}
&head[0..tail.len()].copy_from_slice(tail);
} else {
// construct sub-problem
let mut t = 0;
Expand All @@ -83,13 +77,8 @@ pub fn suffixes_from_substrs<'s, T, F>(
sort(&mut head[..t], k, tail);

// rearrange the lms suffixes
unsafe {
std::ptr::copy_nonoverlapping(
&tail[0] as *const u32,
&mut head[0] as *mut u32,
tail.len(),
);
}
&head[0..tail.len()].copy_from_slice(tail);

let mut h = tail.len();
for_each_lms(s, true, |i, _| {
h -= 1;
Expand Down