about summary refs log tree commit diff
path: root/src/comp
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2012-01-26 08:39:45 -0800
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2012-01-28 09:18:34 -0800
commit259636a112804b94530c409a468b97d4366bb0d3 (patch)
tree572db0f59b254355db6ea83caaf6181e25856009 /src/comp
parenta831e7ce13aa19acf0f65e508097351f8dabca84 (diff)
downloadrust-259636a112804b94530c409a468b97d4366bb0d3.tar.gz
rust-259636a112804b94530c409a468b97d4366bb0d3.zip
core: rename vec::position* functions
Almost all of the vec functions that predicates don't have a
corresponding function that takes a single element, so this
commit renames the common fn usecase to be the default.
Diffstat (limited to 'src/comp')
-rw-r--r--src/comp/middle/alias.rs2
-rw-r--r--src/comp/middle/shape.rs2
-rw-r--r--src/comp/middle/trans/base.rs2
-rw-r--r--src/comp/middle/typeck.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/comp/middle/alias.rs b/src/comp/middle/alias.rs
index 10a45349d4a..a8a88dfa193 100644
--- a/src/comp/middle/alias.rs
+++ b/src/comp/middle/alias.rs
@@ -679,7 +679,7 @@ fn filter_invalid(src: list<@invalid>, bs: [binding]) -> list<@invalid> {
     while cur != list::nil {
         alt cur {
           list::cons(head, tail) {
-            let p = vec::position_pred(bs, {|b| b.node_id == head.node_id});
+            let p = vec::position(bs, {|b| b.node_id == head.node_id});
             if !is_none(p) { out = list::cons(head, @out); }
             cur = *tail;
           }
diff --git a/src/comp/middle/shape.rs b/src/comp/middle/shape.rs
index 7612148df45..389f490e8e9 100644
--- a/src/comp/middle/shape.rs
+++ b/src/comp/middle/shape.rs
@@ -430,7 +430,7 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t, ty_param_map: [uint]) -> [u8] {
       }
       ty::ty_param(n, _) {
         // Find the type parameter in the parameter list.
-        alt vec::position(n, ty_param_map) {
+        alt vec::position_elt(ty_param_map, n) {
           some(i) { s += [shape_var, i as u8]; }
           none { fail "ty param not found in ty_param_map"; }
         }
diff --git a/src/comp/middle/trans/base.rs b/src/comp/middle/trans/base.rs
index 9b423be389e..03c98dfa827 100644
--- a/src/comp/middle/trans/base.rs
+++ b/src/comp/middle/trans/base.rs
@@ -3375,7 +3375,7 @@ fn trans_rec(bcx: @block_ctxt, fields: [ast::field],
     let ty_fields = alt ty::struct(bcx_tcx(bcx), t) { ty::ty_rec(f) { f } };
     let temp_cleanups = [];
     for fld in fields {
-        let ix = option::get(vec::position_pred(ty_fields, {|ft|
+        let ix = option::get(vec::position(ty_fields, {|ft|
             str::eq(fld.node.ident, ft.ident)
         }));
         let dst = GEP_tup_like_1(bcx, t, addr, [0, ix as int]);
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index 8a06314a96b..b9137924652 100644
--- a/src/comp/middle/typeck.rs
+++ b/src/comp/middle/typeck.rs
@@ -1513,7 +1513,7 @@ fn lookup_method(fcx: @fn_ctxt, isc: resolve::iscopes,
                     ty::ty_iface(i, tps) { (i, tps) }
                 };
                 let ifce_methods = ty::iface_methods(tcx, iid);
-                alt vec::position_pred(*ifce_methods, {|m| m.ident == name}) {
+                alt vec::position(*ifce_methods, {|m| m.ident == name}) {
                   some(pos) {
                     let m = ifce_methods[pos];
                     ret some({method_ty: ty::mk_fn(tcx, m.fty),