Skip to content

Commit 1383e49

Browse files
committed
cleanup
1 parent b1edeeb commit 1383e49

File tree

3 files changed

+15
-28
lines changed

3 files changed

+15
-28
lines changed

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
mod searching;
2-
mod sorting;
1+
pub mod searching;
2+
pub mod sorting;
33

44
#[cfg(test)]
55
mod tests {

src/sorting/bubble_sort.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#[allow(dead_code)]
21
pub fn bubble_sort<T: Ord>(arr: &mut [T]) {
32
for i in 0..arr.len() {
43
for j in 0..arr.len() - 1 - i {

src/sorting/quick_sort.rs

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,24 @@
1-
extern crate std;
2-
3-
fn _display<T: std::fmt::Display>(arr: &[T]) {
4-
print!("\n");
5-
for item in arr {
6-
print!("{} ", item);
7-
}
8-
}
9-
101
fn _partition<T: Ord>(arr: &mut [T], lo: isize, hi: isize) -> isize {
11-
let pivot: *mut T = &mut arr[hi as usize];
2+
let pivot = hi as usize;
123
let mut i = lo - 1;
134
let mut j = hi;
145

15-
unsafe {
16-
loop {
6+
loop {
7+
i += 1;
8+
while arr[i as usize] < arr[pivot] {
179
i += 1;
18-
while arr[i as usize] < *pivot {
19-
i += 1;
20-
}
10+
}
11+
j -= 1;
12+
while j >= 0 && arr[j as usize] > arr[pivot] {
2113
j -= 1;
22-
while j >= 0 && arr[j as usize] > *pivot {
23-
j -= 1;
24-
}
25-
if i >= j {
26-
break;
27-
} else {
28-
arr.swap(i as usize, j as usize);
29-
}
14+
}
15+
if i >= j {
16+
break;
17+
} else {
18+
arr.swap(i as usize, j as usize);
3019
}
3120
}
32-
arr.swap(i as usize, hi as usize);
21+
arr.swap(i as usize, pivot as usize);
3322
return i;
3423
}
3524
fn _quick_sort<T: Ord>(arr: &mut [T], lo: isize, hi: isize) {
@@ -39,7 +28,6 @@ fn _quick_sort<T: Ord>(arr: &mut [T], lo: isize, hi: isize) {
3928
_quick_sort(arr, p + 1, hi);
4029
}
4130
}
42-
#[allow(dead_code)]
4331
pub fn quick_sort<T: Ord>(arr: &mut [T]) {
4432
let len = arr.len();
4533
_quick_sort(arr, 0, (len - 1) as isize);

0 commit comments

Comments
 (0)