Skip to content

Commit f98f00f

Browse files
committed
Fix timsort to use updated vec::reserve
1 parent cef7763 commit f98f00f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/libstd/sort.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ fn binarysort<T: Ord>(array: &[mut T], start: uint) {
219219

220220
if start == 0 { start += 1; }
221221

222-
let mut pivot = ~[mut];
223-
vec::reserve(pivot, 1);
222+
let mut pivot = ~[];
223+
vec::reserve(&mut pivot, 1);
224224
unsafe { vec::raw::set_len(pivot, 1); };
225225

226226
while start < size {
@@ -409,7 +409,7 @@ struct MergeState<T> {
409409

410410
fn MergeState<T>() -> MergeState<T> {
411411
let mut tmp = ~[];
412-
vec::reserve(tmp, INITIAL_TMP_STORAGE);
412+
vec::reserve(&mut tmp, INITIAL_TMP_STORAGE);
413413
MergeState {
414414
minGallop: MIN_GALLOP,
415415
tmp: tmp,
@@ -467,7 +467,7 @@ impl<T: Ord> &MergeState<T> {
467467
fn mergeLo(array: &[mut T], base1: uint, len1: uint, base2: uint, len2: uint) {
468468
assert len1 != 0 && len2 != 0 && base1+len1 == base2;
469469

470-
vec::reserve(self.tmp, len1);
470+
vec::reserve(&mut self.tmp, len1);
471471

472472
unsafe {
473473
vec::raw::set_len(self.tmp, len1);
@@ -587,7 +587,7 @@ impl<T: Ord> &MergeState<T> {
587587
fn mergeHi(array: &[mut T], base1: uint, len1: uint, base2: uint, len2: uint) {
588588
assert len1 != 1 && len2 != 0 && base1 + len1 == base2;
589589

590-
vec::reserve(self.tmp, len2);
590+
vec::reserve(&mut self.tmp, len2);
591591

592592
unsafe {
593593
vec::raw::set_len(self.tmp, len2);

0 commit comments

Comments
 (0)