---

yaml
---
r: 28578
b: refs/heads/try
c: 9b58369
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: e653d493fb8df74bd0583c4f32c882a590135ef1
+refs/heads/try: 9b58369f6ba8e01f1965e8aa39e8c7fc25f861cc
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/middle/ty.rs

@@ -1950,7 +1950,11 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
       // Trait instances are (for now) like shared boxes, basically
       ty_trait(_, _, _) => kind_safe_for_default_mode() | kind_owned(),
 
-      // Region pointers are copyable but NOT owned nor sendable
+      // Static region pointers are copyable and sendable, but not owned
+      ty_rptr(re_static, mt) =>
+      kind_safe_for_default_mode() | mutable_type_kind(cx, mt),
+
+      // General region pointers are copyable but NOT owned nor sendable
       ty_rptr(_, _) => kind_safe_for_default_mode(),
 
       // Unique boxes and vecs have the kind of their contained type,
@@ -1972,6 +1976,9 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
       ty_evec(tm, vstore_box) => {
         remove_send(kind_safe_for_default_mode() | mutable_type_kind(cx, tm))
       }
+      ty_evec(tm, vstore_slice(re_static)) => {
+        kind_safe_for_default_mode() | mutable_type_kind(cx, tm)
+      }
       ty_evec(tm, vstore_slice(_)) => {
         remove_owned_send(kind_safe_for_default_mode() |
                           mutable_type_kind(cx, tm))
@@ -1984,6 +1991,9 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
       ty_estr(vstore_box) => {
         kind_safe_for_default_mode() | kind_const() | kind_owned()
       }
+      ty_estr(vstore_slice(re_static)) => {
+        kind_safe_for_default_mode() | kind_send_copy() | kind_const()
+      }
       ty_estr(vstore_slice(_)) => {
         kind_safe_for_default_mode() | kind_const()
       }