---

yaml
---
r: 63481
b: refs/heads/snap-stage3
c: 3ba8404
h: refs/heads/master
i:
  63479: d40b7a4
v: v3

Author: bblum

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 643be38cfe269effdc02111677559f74385b1056
+refs/heads/snap-stage3: 3ba8404c88972f2324ce97fa7e5a433399d946ed
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/borrowck/gather_loans/gather_moves.rs

@@ -115,11 +115,14 @@ fn check_is_legal_to_move_from(bccx: @BorrowckCtxt,
         // These are separate from the above cases for a better error message.
         mc::cat_stack_upvar(*) |
         mc::cat_copied_upvar(mc::CopiedUpvar { onceness: ast::Many, _ }) => {
+            let once_hint = if bccx.tcx.sess.once_fns() {
+                " (unless the destination closure type is `once fn')"
+            } else {
+                ""
+            };
             bccx.span_err(
                 cmt0.span,
-                fmt!("cannot move out of %s \
-                      (unless the destination closure type is `once fn')",
-                     bccx.cmt_to_str(cmt)));
+                fmt!("cannot move out of %s%s", bccx.cmt_to_str(cmt), once_hint));
             false
         }