Skip to content

Commit 7fdb84b

Browse files
committed
---
yaml --- r: 37221 b: refs/heads/try c: 9abc7f0 h: refs/heads/master i: 37219: a317b1c v: v3
1 parent b2c3423 commit 7fdb84b

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: 632d60691a8bd9fb85e3874016d4c1b24657de03
5+
refs/heads/try: 9abc7f0a1cb5086fa6d9a38841258859a16cbdfe
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/rustc/middle/liveness.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,15 @@ fn check_expr(expr: @expr, &&self: @Liveness, vt: vt<@Liveness>) {
14611461
match ty::resolved_mode(self.tcx, arg_ty.mode) {
14621462
by_val | by_copy | by_ref => {}
14631463
by_move => {
1464-
self.check_move_from_expr(*arg_expr, vt);
1464+
if ty::expr_is_lval(self.tcx, self.ir.method_map,
1465+
*arg_expr) {
1466+
// Probably a bad error message (what's an rvalue?)
1467+
// but I can't think of anything better
1468+
self.tcx.sess.span_err(arg_expr.span,
1469+
#fmt("Move mode argument must be an rvalue: try \
1470+
(move %s) instead", expr_to_str(*arg_expr,
1471+
self.tcx.sess.intr())));
1472+
}
14651473
}
14661474
}
14671475
}

0 commit comments

Comments
 (0)