---

yaml
---
r: 7893
b: refs/heads/snap-stage3
c: d6996c0
h: refs/heads/master
i:
  7891: b95f68f
v: v3

Author: marijnh

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 29ba19633651e4c51cddf3c2c089c1c36ed531c6
+refs/heads/snap-stage3: d6996c0210a7ec4dc82a99b394fbde086318f1ed
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/doc/tutorial.md

@@ -929,8 +929,8 @@ for the parameter list, as in `{|| ...}`.
 Partial application is done using the `bind` keyword in Rust.
 
 ~~~~
-let daynum = bind vec::position_elt(["mo", "tu", "we", "do",
-                                     "fr", "sa", "su"], _);
+let daynum = bind vec::position(_, ["mo", "tu", "we", "do",
+                                    "fr", "sa", "su"]);
 ~~~~
 
 Binding a function produces a boxed closure (`fn@` type) in which some

branches/snap-stage3/mk/install.mk

@@ -5,10 +5,10 @@
 # Installation macro. Call with source directory as arg 1,
 # destination directory as arg 2, and filename/libname-glob as arg 3
 ifdef VERBOSE
- INSTALL = install -m755 -T $(1)/$(3) $(2)/$(3)
+ INSTALL = install -m755 $(1)/$(3) $(2)/$(3)
  INSTALL_LIB = install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/
 else
- INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 -T $(1)/$(3) $(2)/$(3)
+ INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3)
  INSTALL_LIB = $(Q)$(call E, install_lib: $(2)/$(3)) &&                    \
 	       install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/
 endif

branches/snap-stage3/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(bs, {|b| b.node_id == head.node_id});
+            let p = vec::position_pred(bs, {|b| b.node_id == head.node_id});
             if !is_none(p) { out = list::cons(head, @out); }
             cur = *tail;
           }

branches/snap-stage3/src/comp/middle/resolve.rs

@@ -445,7 +445,7 @@ fn visit_item_with_scope(e: @env, i: @ast::item, sc: scopes, v: vt<scopes>) {
         v.visit_ty(sty, sc, v);
         for m in methods {
             let msc = cons(scope_method(i.id, tps + m.tps), @sc);
-            v.visit_fn(visit::fk_method(m.ident, []),
+            v.visit_fn(visit::fk_method(m.ident, m.tps),
                        m.decl, m.body, m.span, m.id, msc, v);
         }
       }

branches/snap-stage3/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_elt(ty_param_map, n) {
+        alt vec::position(n, ty_param_map) {
           some(i) { s += [shape_var, i as u8]; }
           none { fail "ty param not found in ty_param_map"; }
         }

branches/snap-stage3/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(ty_fields, {|ft|
+        let ix = option::get(vec::position_pred(ty_fields, {|ft|
             str::eq(fld.node.ident, ft.ident)
         }));
         let dst = GEP_tup_like_1(bcx, t, addr, [0, ix as int]);

branches/snap-stage3/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(*ifce_methods, {|m| m.ident == name}) {
+                alt vec::position_pred(*ifce_methods, {|m| m.ident == name}) {
                   some(pos) {
                     let m = ifce_methods[pos];
                     ret some({method_ty: ty::mk_fn(tcx, m.fty),