Skip to content

Commit faa83ce

Browse files
committed
---
yaml --- r: 40439 b: refs/heads/dist-snap c: 27cca5b h: refs/heads/master i: 40437: 46a2d44 40435: c7f0831 40431: 7f4211d v: v3
1 parent 78c9363 commit faa83ce

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
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
99
refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
10-
refs/heads/dist-snap: dc5ff64abb142413156b569cc32c83e605232c43
10+
refs/heads/dist-snap: 27cca5b61b5daaec6f07b9e24c368a595df58060
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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)