---

yaml
---
r: 5602
b: refs/heads/master
c: cb4e99b
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14bac217b0cfc5e1640a739605e3c3d7e33525c4
+refs/heads/master: cb4e99b68809a17db5624aabbdf9189225333d85

trunk/src/comp/middle/kind.rs

@@ -189,6 +189,9 @@ fn need_shared_or_pinned_ctor(tcx: ty::ctxt, a: @ast::expr, descr: str) {
           ast::expr_tup(_) {
             true
           }
+          ast::expr_vec(exprs, _) {
+            true
+          }
           _ { false }
         }
     }
@@ -262,6 +265,13 @@ fn check_expr(tcx: ty::ctxt, e: @ast::expr) {
             need_shared_or_pinned_ctor(tcx, expr, "tuple parameter");
         }
       }
+      ast::expr_vec(exprs, _) {
+        // Putting pinned things into vectors is pretty useless since vector
+        // addition can't work (it's a copy)
+        for expr in exprs {
+            need_expr_kind(tcx, expr, ast::kind_shared, "vector element");
+        }
+      }
       _ { }
     }
 }

trunk/src/test/compile-fail/vec-res-add.rs

@@ -0,0 +1,11 @@
+// error-pattern:mismatched kinds
+
+resource r(i: int) {
+}
+
+fn main() {
+    // This can't make sense as it would copy the resources
+    let i <- [r(0)];
+    let j <- [r(1)];
+    let k = i + j;
+}