---

14427 · 14427 · commit ae54392f725f · 2012-10-22T21:49:47.000-05:00
yaml --- r: 34873 b: refs/heads/master c: 781e446 h: refs/heads/master i: 34871: ef800c6 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1380776d36ca269a7c0c7684568e6ae2d395107f
+refs/heads/master: 781e446e2675c397d9be8a70f5e3e8c4fae0695c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
diff --git a/trunk/src/libstd/sort.rs b/trunk/src/libstd/sort.rs
@@ -430,7 +430,8 @@ impl<T: Ord> MergeState<T> {
             array[left] <-> self.tmp[0];
             start += 1;
         }
-        unsafe { vec::raw::set_len(&mut self.tmp, 0); } // Forget the boxed element
+        // Forget the boxed element
+        unsafe { vec::raw::set_len(&mut self.tmp, 0); }
         self.last_bsort = false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,8 @@ impl<T: Ord> MergeState<T> {`
`430`	`430`	`array[left] <-> self.tmp[0];`
`431`	`431`	`start += 1;`
`432`	`432`	`}`
`433`		`- unsafe { vec::raw::set_len(&mut self.tmp, 0); } // Forget the boxed element`
	`433`	`+ // Forget the boxed element`
	`434`	`+ unsafe { vec::raw::set_len(&mut self.tmp, 0); }`
`434`	`435`	`self.last_bsort = false;`
`435`	`436`	`}`
`436`	`437`