user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove a few kludges that worked around issue #913

Browse source
This commit is contained in:
Marijn Haverbeke 2011-09-28 12:59:44 +02:00
parent c94159652a
commit 512cfb4b83
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/comp/middle/alias.rs
View file

@ -395,9 +395,7 @@ fn check_alt(cx: ctx, input: @ast::expr, arms: [ast::arm], sc: scope,
for pat in a.pats {
for proot in pattern_roots(cx.tcx, root.mut, pat) {
let canon_id = pat_id_map.get(proot.name);
// FIXME I wanted to use a block here, but that hit bug #913
fn match(x: info, canon: node_id) -> bool { x.id == canon }
alt vec::find(bind match(_, canon_id), binding_info) {
alt vec::find({|x| x.id == canon_id}, binding_info) {
some(s) { s.unsafe += unsafe_set(proot.mut); }
none. {
binding_info += [{id: canon_id,

5
src/comp/middle/trans.rs
View file

@ -4091,10 +4091,7 @@ fn trans_rec(bcx: @block_ctxt, fields: [ast::field],
for tf in ty_fields {
let dst = GEP_tup_like_1(bcx, t, addr, [0, i]);
bcx = dst.bcx;
// FIXME make this again when
// bug #913 is fixed
fn test(n: str, f: ast::field) -> bool { str::eq(f.node.ident, n) }
alt vec::find(bind test(tf.ident, _), fields) {
alt vec::find({|f| str::eq(f.node.ident, tf.ident)}, fields) {
some(f) {
bcx = trans_expr_save_in(bcx, f.node.expr, dst.val, INIT);
}