diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-08-11 22:48:08 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-08-12 12:14:06 -0700 |
| commit | 7625ed52eee77078747f9e9639b89166681abef8 (patch) | |
| tree | 7a842c731963da6dffadbaf55bd0268bc9b872fd /src/comp | |
| parent | abf41e15ead7bcf4a4faff86b1f9dd2a07a64ef6 (diff) | |
| download | rust-7625ed52eee77078747f9e9639b89166681abef8.tar.gz rust-7625ed52eee77078747f9e9639b89166681abef8.zip | |
Remove vecs from std::sort
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/front/attr.rs | 2 | ||||
| -rw-r--r-- | src/comp/metadata/encoder.rs | 2 | ||||
| -rw-r--r-- | src/comp/middle/trans_objects.rs | 4 | ||||
| -rw-r--r-- | src/comp/middle/ty.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/comp/front/attr.rs b/src/comp/front/attr.rs index 061193022cb..3d3a26bc228 100644 --- a/src/comp/front/attr.rs +++ b/src/comp/front/attr.rs @@ -155,7 +155,7 @@ fn sort_meta_items(items: &[@ast::meta_item]) -> [@ast::meta_item] { let v: [mutable @ast::meta_item] = ~[mutable]; for mi: @ast::meta_item in items { v += ~[mutable mi]; } - std::sort::ivector::quick_sort(lteq, v); + std::sort::quick_sort(lteq, v); let v2: [@ast::meta_item] = ~[]; for mi: @ast::meta_item in v { v2 += ~[mi]; } diff --git a/src/comp/metadata/encoder.rs b/src/comp/metadata/encoder.rs index c35da50f965..de06f0114bc 100644 --- a/src/comp/metadata/encoder.rs +++ b/src/comp/metadata/encoder.rs @@ -552,7 +552,7 @@ fn encode_crate_deps(ebml_w: &ebmlivec::writer, cstore: &cstore::cstore) { fn lteq(kv1: &numname, kv2: &numname) -> bool { kv1.crate <= kv2.crate } - std::sort::ivector::quick_sort(lteq, pairs); + std::sort::quick_sort(lteq, pairs); // Sanity-check the crate numbers let expected_cnum = 1; diff --git a/src/comp/middle/trans_objects.rs b/src/comp/middle/trans_objects.rs index d79851813e1..428fb20059e 100644 --- a/src/comp/middle/trans_objects.rs +++ b/src/comp/middle/trans_objects.rs @@ -460,7 +460,7 @@ fn create_vtbl(cx: @local_ctxt, sp: &span, outer_obj_ty: ty::t, // Sort and process all the methods. let meths = - std::sort::ivector::merge_sort[@ast::method] + std::sort::merge_sort[@ast::method] (bind ast_mthd_lteq(_, _), ob.methods); for m: @ast::method in meths { @@ -504,7 +504,7 @@ fn create_vtbl(cx: @local_ctxt, sp: &span, outer_obj_ty: ty::t, // Sort all the methods and process them. meths = - std::sort::ivector::merge_sort[vtbl_mthd] + std::sort::merge_sort[vtbl_mthd] (bind vtbl_mthd_lteq(_, _), meths); // To create forwarding methods, we'll need a "backwarding" vtbl. See diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs index 7ab295fd2e1..c631e9bbd4a 100644 --- a/src/comp/middle/ty.rs +++ b/src/comp/middle/ty.rs @@ -1991,7 +1991,7 @@ fn sort_methods(meths: &[method]) -> [method] { fn method_lteq(a: &method, b: &method) -> bool { ret str::lteq(a.ident, b.ident); } - ret std::sort::ivector::merge_sort[method](bind method_lteq(_, _), meths); + ret std::sort::merge_sort[method](bind method_lteq(_, _), meths); } fn is_lval(expr: &@ast::expr) -> bool { |