From e9451648798dc85a5971e98046cf62dca7a2cb23 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 Sep 2011 13:40:38 +0200
Subject: [PATCH] Always warn when implicitly copying a generic type

---
 src/comp/middle/alias.rs | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/comp/middle/alias.rs b/src/comp/middle/alias.rs
index e68b84e9e70..2beabf5ae3d 100644
--- a/src/comp/middle/alias.rs
+++ b/src/comp/middle/alias.rs
@@ -399,16 +399,15 @@ fn test_scope(cx: ctx, sc: scope, r: restrict, p: ast::path) {
       _ {}
     }
     if prob != valid && cant_copy(cx, r) {
-        let msg =
-            alt prob {
-              overwritten(sp, wpt) {
-                {span: sp, msg: "overwriting " + ast_util::path_name(wpt)}
-              }
-              val_taken(sp, vpt) {
-                {span: sp,
-                 msg: "taking the value of " + ast_util::path_name(vpt)}
-              }
-            };
+        let msg = alt prob {
+          overwritten(sp, wpt) {
+            {span: sp, msg: "overwriting " + ast_util::path_name(wpt)}
+          }
+          val_taken(sp, vpt) {
+            {span: sp,
+             msg: "taking the value of " + ast_util::path_name(vpt)}
+          }
+        };
         cx.tcx.sess.span_err(msg.span,
                              msg.msg + " will invalidate reference " +
                                  ast_util::path_name(p) +
@@ -515,7 +514,7 @@ fn copy_is_expensive(tcx: ty::ctxt, ty: ty::t) -> bool {
           ty::ty_constr(t, _) | ty::ty_res(_, t, _) { score_ty(tcx, t) }
           ty::ty_fn(_, _, _, _, _) | ty::ty_native_fn(_, _, _) |
           ty::ty_obj(_) { 4u }
-          ty::ty_str. | ty::ty_vec(_) { 50u }
+          ty::ty_str. | ty::ty_vec(_) | ty::ty_param(_, _) { 50u }
           ty::ty_uniq(t) { 1u + score_ty(tcx, t) }
           ty::ty_tag(_, ts) | ty::ty_tup(ts) {
             let sum = 0u;
@@ -527,7 +526,6 @@ fn copy_is_expensive(tcx: ty::ctxt, ty: ty::t) -> bool {
             for f in fs { sum += score_ty(tcx, f.mt.ty); }
             sum
           }
-          ty::ty_param(_, _) { 5u }
         };
     }
     ret score_ty(tcx, ty) > 8u;