---

catamorphism · catamorphism · commit c73dd103859b · 2012-06-01T20:40:35.000-07:00
yaml --- r: 13195 b: refs/heads/master c: 7978783 h: refs/heads/master i: 13193: 109a9d2 13191: 358da6b v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 475013fcb60607130b7661f601eee3391ac2bd47
+refs/heads/master: 79787833bbf1c705bb1fa877a88339260a90ec11
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/rustc/middle/ty.rs b/trunk/src/rustc/middle/ty.rs
@@ -1340,6 +1340,10 @@ fn remove_implicit(k: kind) -> kind {
     k - kind_(KIND_MASK_IMPLICIT)
 }
 
+fn remove_copyable(k: kind) -> kind {
+    k - kind_(KIND_MASK_COPY)
+}
+
 impl operators for kind {
     fn &(other: kind) -> kind {
         lower_kind(self, other)
@@ -1508,7 +1512,7 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
         // ...but classes with dtors are never copyable (they can be
         // sendable)
         if ty::has_dtor(cx, did) {
-           lowest = lower_kind(lowest, kind_noncopyable());
+           lowest = remove_copyable(lowest);
         }
         lowest
       }

Original file line number	Diff line number	Diff line change
`@@ -1340,6 +1340,10 @@ fn remove_implicit(k: kind) -> kind {`
`1340`	`1340`	`k - kind_(KIND_MASK_IMPLICIT)`
`1341`	`1341`	`}`
`1342`	`1342`
	`1343`	`+fn remove_copyable(k: kind) -> kind {`
	`1344`	`+ k - kind_(KIND_MASK_COPY)`
	`1345`	`+}`
	`1346`	`+`
`1343`	`1347`	`impl operators for kind {`
`1344`	`1348`	`fn &(other: kind) -> kind {`
`1345`	`1349`	`lower_kind(self, other)`
`@@ -1508,7 +1512,7 @@ fn type_kind(cx: ctxt, ty: t) -> kind {`
`1508`	`1512`	`// ...but classes with dtors are never copyable (they can be`
`1509`	`1513`	`// sendable)`
`1510`	`1514`	`if ty::has_dtor(cx, did) {`
`1511`		`- lowest = lower_kind(lowest, kind_noncopyable());`
	`1515`	`+ lowest = remove_copyable(lowest);`
`1512`	`1516`	`}`
`1513`	`1517`	`lowest`
`1514`	`1518`	`}`