---

yaml
---
r: 36065
b: refs/heads/try2
c: 1380776
h: refs/heads/master
i:
  36063: 5fa8f23
v: v3

Author: 14427

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 71c311cec5fa4a71e5349ed2df962a7adfd336bd
+refs/heads/try2: 1380776d36ca269a7c0c7684568e6ae2d395107f
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/sort.rs

@@ -394,8 +394,8 @@ fn MergeState<T>() -> MergeState<T> {
     }
 }
 
-impl<T: Ord> &MergeState<T> {
-    fn binarysort(array: &[mut T], start: uint) {
+impl<T: Ord> MergeState<T> {
+    fn binarysort(&self, array: &[mut T], start: uint) {
         let size = array.len();
         let mut start = start;
         assert start <= size;
@@ -434,12 +434,12 @@ impl<T: Ord> &MergeState<T> {
         self.last_bsort = false;
     }
 
-    fn push_run(run_base: uint, run_len: uint) {
+    fn push_run(&self, run_base: uint, run_len: uint) {
         let tmp = RunState{base: run_base, len: run_len};
         self.runs.push(tmp);
     }
 
-    fn merge_at(n: uint, array: &[mut T]) {
+    fn merge_at(&self, n: uint, array: &[mut T]) {
         let mut size = self.runs.len();
         assert size >= 2;
         assert n == size-2 || n == size-3;
@@ -483,7 +483,7 @@ impl<T: Ord> &MergeState<T> {
         self.mergePt = 0;
     }
 
-    fn merge_lo(array: &[mut T], base1: uint, len1: uint,
+    fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
                 base2: uint, len2: uint) {
         assert len1 != 0 && len2 != 0 && base1+len1 == base2;
 
@@ -619,7 +619,7 @@ impl<T: Ord> &MergeState<T> {
         unsafe { vec::raw::set_len(&mut self.tmp, 0); }
     }
 
-    fn merge_hi(array: &[mut T], base1: uint, len1: uint,
+    fn merge_hi(&self, array: &[mut T], base1: uint, len1: uint,
                 base2: uint, len2: uint) {
         assert len1 != 1 && len2 != 0 && base1 + len1 == base2;
 
@@ -762,7 +762,7 @@ impl<T: Ord> &MergeState<T> {
         unsafe { vec::raw::set_len(&mut self.tmp, 0); }
     }
 
-    fn merge_collapse(array: &[mut T]) {
+    fn merge_collapse(&self, array: &[mut T]) {
         while self.runs.len() > 1 {
             let mut n = self.runs.len()-2;
             let chk = do self.runs.borrow |arr| {
@@ -780,7 +780,7 @@ impl<T: Ord> &MergeState<T> {
         }
     }
 
-    fn merge_force_collapse(array: &[mut T]) {
+    fn merge_force_collapse(&self, array: &[mut T]) {
         while self.runs.len() > 1 {
             let mut n = self.runs.len()-2;
             if n > 0 {