Skip to content

Commit 8357b90

Browse files
committed
---
yaml --- r: 14071 b: refs/heads/try c: 91b6dc5 h: refs/heads/master i: 14069: f973421 14067: e57f782 14063: daf8f6a v: v3
1 parent 7046fce commit 8357b90

File tree

9 files changed

+459
-31
lines changed

9 files changed

+459
-31
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 6be25c8a0cfe28f032ce2b65f8cb07dd1a1ae148
5+
refs/heads/try: 91b6dc5c8ed8d839006de4ea6a7e8cd6727db93d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/doc/tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -922,8 +922,8 @@ for the parameter list, as in `{|| ...}`.
922922
Partial application is done using the `bind` keyword in Rust.
923923

924924
~~~~
925-
let daynum = bind vec::position(_, ["mo", "tu", "we", "do",
926-
"fr", "sa", "su"]);
925+
let daynum = bind vec::position_elt(["mo", "tu", "we", "do",
926+
"fr", "sa", "su"], _);
927927
~~~~
928928

929929
Binding a function produces a boxed closure (`fn@` type) in which some

branches/try/src/comp/middle/alias.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ fn filter_invalid(src: list<@invalid>, bs: [binding]) -> list<@invalid> {
702702
while cur != list::nil {
703703
alt cur {
704704
list::cons(head, tail) {
705-
let p = vec::position_pred(bs, {|b| b.node_id == head.node_id});
705+
let p = vec::position(bs, {|b| b.node_id == head.node_id});
706706
if !is_none(p) { out = list::cons(head, @out); }
707707
cur = *tail;
708708
}

branches/try/src/comp/middle/shape.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t, ty_param_map: [uint]) -> [u8] {
426426
}
427427
ty::ty_param(n, _) {
428428
// Find the type parameter in the parameter list.
429-
alt vec::position(n, ty_param_map) {
429+
alt vec::position_elt(ty_param_map, n) {
430430
some(i) { s += [shape_var, i as u8]; }
431431
none { fail "ty param not found in ty_param_map"; }
432432
}

branches/try/src/comp/middle/trans/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3395,7 +3395,7 @@ fn trans_rec(bcx: @block_ctxt, fields: [ast::field],
33953395
have a record type") } };
33963396
let temp_cleanups = [];
33973397
for fld in fields {
3398-
let ix = option::get(vec::position_pred(ty_fields, {|ft|
3398+
let ix = option::get(vec::position(ty_fields, {|ft|
33993399
str::eq(fld.node.ident, ft.ident)
34003400
}));
34013401
let dst = GEP_tup_like_1(bcx, t, addr, [0, ix as int]);

branches/try/src/comp/middle/typeck.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ fn lookup_method(fcx: @fn_ctxt, isc: resolve::iscopes,
14801480
}
14811481
};
14821482
let ifce_methods = ty::iface_methods(tcx, iid);
1483-
alt vec::position_pred(*ifce_methods, {|m| m.ident == name}) {
1483+
alt vec::position(*ifce_methods, {|m| m.ident == name}) {
14841484
some(pos) {
14851485
let m = ifce_methods[pos];
14861486
ret some({method_ty: ty::mk_fn(tcx, m.fty),

0 commit comments

Comments
 (0)