Skip to content

Commit 5d02380

Browse files
jesse99brson
authored andcommitted
---
yaml --- r: 39025 b: refs/heads/incoming c: 333d268 h: refs/heads/master i: 39023: 92b3f46 v: v3
1 parent 03cb860 commit 5d02380

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
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: 6d99a2f8a99baedab90fb8bd6cb6e1507fad736b
9+
refs/heads/incoming: 333d268b3ef5846fc22c73c01f69a12bf11f6b9d
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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)