Skip to content

Commit faf797e

Browse files
jesse99brson
authored andcommitted
---
yaml --- r: 33748 b: refs/heads/snap-stage3 c: 333d268 h: refs/heads/master v: v3
1 parent 7e0d8b2 commit faf797e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 6d99a2f8a99baedab90fb8bd6cb6e1507fad736b
4+
refs/heads/snap-stage3: 333d268b3ef5846fc22c73c01f69a12bf11f6b9d
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ type Le<T> = pure fn(v1: &T, v2: &T) -> bool;
1313
* Has worst case O(n log n) performance, best case O(n), but
1414
* is not space efficient. This is a stable sort.
1515
*/
16-
pub fn merge_sort<T: Copy>(v: &[const T], le: Le<T>) -> ~[T] {
16+
pub pure fn merge_sort<T: Copy>(v: &[const T], le: Le<T>) -> ~[T] {
1717
type Slice = (uint, uint);
1818

19-
return merge_sort_(v, (0u, len(v)), le);
19+
unsafe {return merge_sort_(v, (0u, len(v)), le);}
2020

2121
fn merge_sort_<T: Copy>(v: &[const T], slice: Slice, le: Le<T>)
2222
-> ~[T] {

0 commit comments

Comments
 (0)