---

yaml
---
r: 40200
b: refs/heads/dist-snap
c: 046460c
h: refs/heads/master
v: v3

Author: 14427

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 19a59cb748b6715cd940eb6fa5ae4e1841dcfcf4
+refs/heads/dist-snap: 046460c7f6ff9d196b0d4c9757bce15cf99e1070
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/sort.rs

@@ -353,40 +353,15 @@ struct RunState {
 
 struct MergeState<T> {
     mut min_gallop: uint,
-    //mut tmp: ~[T],
-    mut last_hi: bool,
-    mut last_bsort: bool,
     mut mergePt: uint,
     mut tmpPt: uint,
     mut array: &[mut T],
     runs: DVec<RunState>,
-
-    /*drop {
-        unsafe {
-            let size = self.tmp.len();
-            // Move tmp back into invalid part of array
-            if self.last_bsort {
-
-            } else if self.last_hi && size > 0 {
-                self.mergePt -= self.tmpPt;
-                move_vec(self.array, self.mergePt, self.tmp, 0, self.tmpPt);
-            } else if !self.last_hi && size-self.tmpPt > 0 {
-                move_vec(self.array, self.mergePt,
-                        self.tmp, self.tmpPt, size-self.tmpPt);
-            }
-            vec::raw::set_len(&mut self.tmp, 0);
-        }
-    }*/
 }
 
 fn MergeState<T>() -> MergeState<T> {
-    //let mut tmp = ~[];
-    //vec::reserve(&mut tmp, INITIAL_TMP_STORAGE);
     MergeState {
         min_gallop: MIN_GALLOP,
-        //tmp: move tmp,
-        last_hi: false,
-        last_bsort: false,
         mergePt: 0,
         tmpPt: 0,
         array: &[mut],
@@ -402,8 +377,6 @@ impl<T: Copy Ord> MergeState<T> {
 
         if start == 0 { start += 1; }
 
-        self.last_bsort = true;
-
         while start < size {
             let pivot = array[start];
             let mut left = 0;
@@ -425,7 +398,6 @@ impl<T: Copy Ord> MergeState<T> {
             array[left] = move pivot;
             start += 1;
         }
-        self.last_bsort = false;
     }
 
     fn push_run(&self, run_base: uint, run_len: uint) {
@@ -481,8 +453,6 @@ impl<T: Copy Ord> MergeState<T> {
                 base2: uint, len2: uint) {
         assert len1 != 0 && len2 != 0 && base1+len1 == base2;
 
-        //vec::reserve(&mut self.tmp, len1);
-        self.last_hi = false;
         let tmp = vec::to_mut(vec::slice(array, base1, base1+len1));
         self.tmpPt = 0;
         self.mergePt = base1;
@@ -598,8 +568,6 @@ impl<T: Copy Ord> MergeState<T> {
                 base2: uint, len2: uint) {
         assert len1 != 1 && len2 != 0 && base1 + len1 == base2;
 
-        self.last_hi = true;
-
         let tmp = vec::to_mut(vec::slice(array, base2, base2+len2));
 
         let mut c1 = base1 + len1 - 1;
@@ -755,7 +723,7 @@ impl<T: Copy Ord> MergeState<T> {
 fn copy_vec<T: Copy>(dest: &[mut T], s1: uint,
                     from: &[const T], s2: uint, len: uint) {
     assert s1+len <= dest.len() && s2+len <= from.len();
-    
+
     let slice = vec::slice(from, s2, s2+len);
     for slice.eachi |i, v| {
         dest[s1+i] = *v;