---

yaml
---
r: 34751
b: refs/heads/master
c: 9406f81
h: refs/heads/master
i:
  34749: 6e1b29e
  34747: 01f3e0d
  34743: 404a519
  34735: 4a9edf9
  34719: 5cf1ece
  34687: 4082df3
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f1e5b36ab25a6a6c64dac21868cb8f9550c87901
+refs/heads/master: 9406f8101dd32b4458b8c042a1bfb1bb150a2276
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/rustc/middle/kind.rs

@@ -38,6 +38,8 @@ use lint::{non_implicitly_copyable_typarams,implicit_copies};
 // primitives in the stdlib are explicitly annotated to only take sendable
 // types.
 
+const try_adding: &str = "Try adding a move";
+
 fn kind_to_str(k: kind) -> ~str {
     let mut kinds = ~[];
 
@@ -217,7 +219,7 @@ fn check_block(b: blk, cx: ctx, v: visit::vt<ctx>) {
     match b.node.expr {
       Some(ex) => maybe_copy(cx, ex,
          Some(("Tail expressions in blocks must be copyable",
-                                   "Try adding a move"))),
+                                  try_adding))),
       _ => ()
     }
     visit::visit_block(b, cx, v);
@@ -279,11 +281,11 @@ fn check_expr(e: @expr, cx: ctx, v: visit::vt<ctx>) {
       expr_unary(box(_), ex) | expr_unary(uniq(_), ex) |
       expr_ret(Some(ex)) => {
         maybe_copy(cx, ex, Some(("Returned values must be copyable",
-                                 "Try adding a move")));
+                                 try_adding)));
       }
       expr_cast(source, _) => {
         maybe_copy(cx, source, Some(("Casted values must be copyable",
-                                     "Try adding a move")));
+                                     try_adding)));
         check_cast_for_escaping_regions(cx, source, e);
       }
       expr_copy(expr) => check_copy_ex(cx, expr, false,