---

yaml
---
r: 13182
b: refs/heads/master
c: 8f7364b
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2ab1b5838b5d35e57f2f8bcc90f8b70c03e4d9c8
+refs/heads/master: 8f7364b26d22f945f1e013041730caaedc640a80
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/ty.rs

@@ -1434,14 +1434,8 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
       ty_ptr(_) { kind_implicitly_sendable() | kind_const() }
       // FIXME: this *shouldn't* be implicitly copyable (#2450)
       ty_str { kind_implicitly_sendable() | kind_const() }
-      ty_type { kind_copyable() }
       ty_fn(f) { proto_kind(f.proto) }
 
-      // Closures have kind determined by capture mode
-      ty_opaque_closure_ptr(ck_block) { kind_noncopyable() }
-      ty_opaque_closure_ptr(ck_box) { kind_implicitly_copyable() }
-      ty_opaque_closure_ptr(ck_uniq) { kind_sendable() }
-
       // Those with refcounts raise noncopyable to copyable,
       // lower sendable to copyable. Therefore just set result to copyable.
       ty_box(tm) {
@@ -1456,7 +1450,7 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
             else { kind_implicitly_copyable() }
         }
       }
-      ty_iface(_, _) | ty_opaque_box { kind_implicitly_copyable() }
+      ty_iface(_, _) { kind_implicitly_copyable() }
       ty_rptr(_, _) { kind_implicitly_copyable() }
 
       // Unique boxes and vecs have the kind of their contained type,
@@ -1548,6 +1542,9 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
       ty_self { kind_noncopyable() }
 
       ty_var(_) { cx.sess.bug("Asked to compute kind of a type variable"); }
+      ty_type | ty_opaque_closure_ptr(_) | ty_opaque_box {
+        cx.sess.bug("Asked to compute kind of fictitious type");
+      }
     };
 
     cx.kind_cache.insert(ty, result);