---

yaml
---
r: 10591
b: refs/heads/snap-stage3
c: e30a8b6
h: refs/heads/master
i:
  10589: d292b4d
  10587: 8f04389
  10583: 2eb694c
  10575: 1c3017b
  10559: 76cd7e7
v: v3

Author: eholk

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 3cf582b5291b9ab72cac6d54abb405017922475c
+refs/heads/snap-stage3: e30a8b6f8c9b55865c218152ac3066e21a22a953
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rustc/middle/ty.rs

@@ -1608,7 +1608,7 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
       }
       ty_res(did, inner, tps) {
         let inner = subst(cx, tps, inner);
-        (kind_const() & type_kind(cx, inner)) | kind_send_only()
+        (kind_const() | kind_send_only()) & type_kind(cx, inner)
       }
       ty_param(_, did) {
         param_bounds_to_kind(cx.ty_param_bounds.get(did.node))

branches/snap-stage3/src/test/compile-fail/no-send-res-ports.rs

@@ -0,0 +1,11 @@
+fn main() {
+    resource foo(_x: comm::port<()>) {}
+
+    let x = ~mut some(foo(comm::port()));
+
+    task::spawn {|move x| //! ERROR not a sendable value
+        let mut y = none;
+        *x <-> y;
+        log(error, y);
+    }
+}