File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
branches/dist-snap/src/libstd Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
8
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9
9
refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
10
- refs/heads/dist-snap: dc5ff64abb142413156b569cc32c83e605232c43
10
+ refs/heads/dist-snap: 27cca5b61b5daaec6f07b9e24c368a595df58060
11
11
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
12
12
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
13
13
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
Original file line number Diff line number Diff line change @@ -13,10 +13,10 @@ type Le<T> = pure fn(v1: &T, v2: &T) -> bool;
13
13
* Has worst case O(n log n) performance, best case O(n), but
14
14
* is not space efficient. This is a stable sort.
15
15
*/
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 ] {
17
17
type Slice = ( uint , uint ) ;
18
18
19
- return merge_sort_ ( v, ( 0 u, len ( v) ) , le) ;
19
+ unsafe { return merge_sort_ ( v, ( 0 u, len ( v) ) , le) ; }
20
20
21
21
fn merge_sort_ < T : Copy > ( v : & [ const T ] , slice : Slice , le : Le < T > )
22
22
-> ~[ T ] {
You can’t perform that action at this time.
0 commit comments