Remove and comment out more MergeState code

diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs
index 05d8533a3533e1f9178e93754b4c8ba0d0a0b4dc..498959982a9d34bf6a00d3cbcbcff79537c578e0 100644 (file)
--- a/src/libstd/sort.rs
+++ b/src/libstd/sort.rs
@@ -353,8 +353,8 @@ struct RunState {
 
 struct MergeState<T> {
     mut min_gallop: uint,
-    mut mergePt: uint,
-    mut tmpPt: uint,
+    //mut mergePt: uint,
+    //mut tmpPt: uint,
     mut array: &[mut T],
     runs: DVec<RunState>,
 }
@@ -362,8 +362,8 @@ struct MergeState<T> {
 fn MergeState<T>() -> MergeState<T> {
     MergeState {
         min_gallop: MIN_GALLOP,
-        mergePt: 0,
-        tmpPt: 0,
+        //mergePt: 0,
+        //tmpPt: 0,
         array: &[mut],
         runs: DVec(),
     }
@@ -427,13 +427,13 @@ fn merge_at(&self, n: uint, array: &[mut T]) {
             }
 
             let slice = vec::mut_view(array, b1, b1+l1);
-            self.mergePt = b1;
+            //self.mergePt = b1;
             let k = gallop_right(&const array[b2], slice, 0);
             b1 += k;
             l1 -= k;
             if l1 != 0 {
                 let slice = vec::mut_view(array, b2, b2+l2);
-                self.mergePt = b2;
+                //self.mergePt = b2;
                 let l2 = gallop_left(
                     &const array[b1+l1-1],slice,l2-1);
                 if l2 > 0 {
@@ -446,7 +446,7 @@ fn merge_at(&self, n: uint, array: &[mut T]) {
             }
         }
         self.runs.pop();
-        self.mergePt = 0;
+        //self.mergePt = 0;
     }
 
     fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
@@ -454,8 +454,8 @@ fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
         assert len1 != 0 && len2 != 0 && base1+len1 == base2;
 
         let tmp = vec::to_mut(vec::slice(array, base1, base1+len1));
-        self.tmpPt = 0;
-        self.mergePt = base1;
+        //self.tmpPt = 0;
+        //self.mergePt = base1;
 
         let mut c1 = 0;
         let mut c2 = base2;
@@ -465,7 +465,7 @@ fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
 
         array[dest] <-> array[c2];
         dest += 1; c2 += 1; len2 -= 1;
-        self.mergePt += 1;
+        //self.mergePt += 1;
 
         if len2 == 0 {
             copy_vec(array, dest, tmp, 0, len1);
@@ -488,7 +488,7 @@ fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
                 if array[c2] < tmp[c1] {
                     array[dest] <-> array[c2];
                     dest += 1; c2 += 1; len2 -= 1;
-                    self.mergePt += 1;
+                    //self.mergePt += 1;
                     count2 += 1; count1 = 0;
                     if len2 == 0 {
                         break_outer = true;
@@ -496,8 +496,8 @@ fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
                 } else {
                     array[dest] <-> tmp[c1];
                     dest += 1; c1 += 1; len1 -= 1;
-                    self.mergePt += 1;
-                    self.tmpPt += 1;
+                    //self.mergePt += 1;
+                    //self.tmpPt += 1;
                     count1 += 1; count2 = 0;
                     if len1 == 1 {
                         break_outer = true;
@@ -519,12 +519,12 @@ fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
                 if count1 != 0 {
                     copy_vec(array, dest, tmp, c1, count1);
                     dest += count1; c1 += count1; len1 -= count1;
-                    self.mergePt += count1; self.tmpPt += count1;
+                    //self.mergePt += count1; self.tmpPt += count1;
                     if len1 <= 1 { break_outer = true; break; }
                 }
                 array[dest] <-> array[c2];
                 dest += 1; c2 += 1; len2 -= 1;
-                self.mergePt += 1;
+                //self.mergePt += 1;
                 if len2 == 0 { break_outer = true; break; }
 
                 let tmp_view = vec::const_view(array, c2, c2+len2);
@@ -532,12 +532,12 @@ fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
                 if count2 != 0 {
                     copy_vec(array, dest, array, c2, count2);
                     dest += count2; c2 += count2; len2 -= count2;
-                    self.mergePt += count2;
+                    //self.mergePt += count2;
                     if len2 == 0 { break_outer = true; break; }
                 }
                 array[dest] <-> tmp[c1];
                 dest += 1; c1 += 1; len1 -= 1;
-                self.mergePt += 1; self.tmpPt += 1;
+                //self.mergePt += 1; self.tmpPt += 1;
                 if len1 == 1 { break_outer = true; break; }
                 min_gallop -= 1;
                 if !(count1 >= MIN_GALLOP || count2 >= MIN_GALLOP) {
@@ -561,7 +561,7 @@ fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
             assert len1 > 1;
             copy_vec(array, dest, tmp, c1, len1);
         }
-        self.tmpPt = 0;
+        //self.tmpPt = 0;
     }
 
     fn merge_hi(&self, array: &[mut T], base1: uint, len1: uint,
@@ -576,8 +576,8 @@ fn merge_hi(&self, array: &[mut T], base1: uint, len1: uint,
         let mut len1 = len1;
         let mut len2 = len2;
 
-        self.mergePt = dest;
-        self.tmpPt = len2 - 1;
+        //self.mergePt = dest;
+        //self.tmpPt = len2 - 1;
 
         array[dest] <-> array[c1];
         dest -= 1; c1 -= 1; len1 -= 1;
@@ -605,7 +605,7 @@ fn merge_hi(&self, array: &[mut T], base1: uint, len1: uint,
                 if tmp[c2] < array[c1] {
                     array[dest] <-> array[c1];
                     dest -= 1; c1 -= 1; len1 -= 1;
-                    self.mergePt -= 1;
+                    //self.mergePt -= 1;
                     count1 += 1; count2 = 0;
                     if len1 == 0 {
                         break_outer = true;
@@ -613,7 +613,7 @@ fn merge_hi(&self, array: &[mut T], base1: uint, len1: uint,
                 } else {
                     array[dest] <-> tmp[c2];
                     dest -= 1; c2 -= 1; len2 -= 1;
-                    self.mergePt -= 1; self.tmpPt -= 1;
+                    //self.mergePt -= 1; self.tmpPt -= 1;
                     count2 += 1; count1 = 0;
                     if len2 == 1 {
                         break_outer = true;
@@ -635,14 +635,14 @@ fn merge_hi(&self, array: &[mut T], base1: uint, len1: uint,
 
                 if count1 != 0 {
                     dest -= count1; c1 -= count1; len1 -= count1;
-                    self.mergePt -= count1;
+                    //self.mergePt -= count1;
                     copy_vec(array, dest+1, array, c1+1, count1);
                     if len1 == 0 { break_outer = true; break; }
                 }
 
                 array[dest] <-> tmp[c2];
                 dest -= 1; c2 -= 1; len2 -= 1;
-                self.mergePt -= 1; self.tmpPt -= 1;
+                //self.mergePt -= 1; self.tmpPt -= 1;
                 if len2 == 1 { break_outer = true; break; }
 
                 //let tmp_view = vec::mut_view(tmp, 0, len2);
@@ -650,13 +650,13 @@ fn merge_hi(&self, array: &[mut T], base1: uint, len1: uint,
                             vec::mut_view(tmp, 0, len2), len2-1);
                 if count2 != 0 {
                     dest -= count2; c2 -= count2; len2 -= count2;
-                    self.mergePt -= count2; self.tmpPt -= count2;
+                    //self.mergePt -= count2; self.tmpPt -= count2;
                     copy_vec(array, dest+1, tmp, c2+1, count2);
                     if len2 <= 1 { break_outer = true; break; }
                 }
                 array[dest] <-> array[c1];
                 dest -= 1; c1 -= 1; len1 -= 1;
-                self.mergePt -= 1;
+                //self.mergePt -= 1;
                 if len1 == 0 { break_outer = true; break; }
                 min_gallop -= 1;
                 if !(count1 >= MIN_GALLOP || count2 >= MIN_GALLOP) {
@@ -683,7 +683,7 @@ fn merge_hi(&self, array: &[mut T], base1: uint, len1: uint,
             assert len2 != 0;
             copy_vec(array, dest-(len2-1), tmp, 0, len2);
         }
-        self.tmpPt = 0;
+        //self.tmpPt = 0;
     }
 
     fn merge_collapse(&self, array: &[mut T]) {
@@ -1139,7 +1139,7 @@ fn isSorted<T: Ord>(arr: &[const @T]) {
                 arr[idx] = @rng.gen_float();
             }
             tim_sort(arr);
-            isSorted(arr, 1);
+            isSorted(arr);
 
             let arr = if n > 4 {
                 let part = vec::view(arr, 0, 4);