Skip to content

Commit 7664bd9

Browse files
committed
---
yaml --- r: 3505 b: refs/heads/master c: 37bfbc4 h: refs/heads/master i: 3503: 2a74767 v: v3
1 parent 0569d65 commit 7664bd9

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 6a74253d60821df84ea18e84441f0d83298f0592
2+
refs/heads/master: 37bfbc4b79afb7dc0b0408677f88387613a31251

trunk/src/comp/middle/trans.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4728,9 +4728,8 @@ fn trans_alt(&@block_ctxt cx, &@ast::expr expr, &vec[ast::arm] arms,
47284728
this_cx = next_cx;
47294729
}
47304730
auto default_cx = this_cx;
4731-
auto default_res =
4732-
trans_fail(default_cx, some[common::span](expr.span),
4733-
"non-exhaustive match failure");
4731+
trans_fail(default_cx, some[common::span](expr.span),
4732+
"non-exhaustive match failure");
47344733
ret rslt(join_branches(cx, arm_results), C_nil());
47354734
}
47364735

@@ -4995,8 +4994,7 @@ fn trans_index(&@block_ctxt cx, &span sp, &@ast::expr base, &@ast::expr idx,
49954994
bcx.build.CondBr(bounds_check, next_cx.llbb, fail_cx.llbb);
49964995
// fail: bad bounds check.
49974996

4998-
auto fail_res =
4999-
trans_fail(fail_cx, some[common::span](sp), "bounds check");
4997+
trans_fail(fail_cx, some[common::span](sp), "bounds check");
50004998
auto body;
50014999
alt (interior_len_and_data) {
50025000
case (some(?lad)) { body = lad._1; }
@@ -6291,7 +6289,7 @@ fn trans_check_expr(&@block_ctxt cx, &@ast::expr e, &str s) -> result {
62916289
auto cond_res = trans_expr(cx, e);
62926290
auto expr_str = s + " " + expr_to_str(e) + " failed";
62936291
auto fail_cx = new_sub_block_ctxt(cx, "fail");
6294-
auto fail_res = trans_fail(fail_cx, some[common::span](e.span), expr_str);
6292+
trans_fail(fail_cx, some[common::span](e.span), expr_str);
62956293
auto next_cx = new_sub_block_ctxt(cx, "next");
62966294
cond_res.bcx.build.CondBr(cond_res.val, next_cx.llbb, fail_cx.llbb);
62976295
ret rslt(next_cx, C_nil());

0 commit comments

Comments
 (0)