---

yaml
---
r: 13158
b: refs/heads/master
c: 0470abe
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3acc3c4d85e017edde2149eaabd44a78be5f7e17
+refs/heads/master: 0470abe1d290ef28fa72693b70f955328656e471
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/ty.rs

@@ -1526,7 +1526,10 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
         }
         lowest
       }
-      ty_res(did, inner, tps) { kind_send_only() }
+      ty_res(did, inner, tps) {
+        let inner = subst(cx, tps, inner);
+        (kind_const() & type_kind(cx, inner)) | kind_send_only()
+      }
       ty_param(_, did) {
         // FIXME: type params shouldn't be implicitly copyable (#2449)
         let k = param_bounds_to_kind(cx.ty_param_bounds.get(did.node));

trunk/src/test/compile-fail/non-const.rs

@@ -3,6 +3,7 @@
 fn foo<T: const>(_x: T) { }
 
 resource r(_x: int) {}
+resource r2(_x: @mut int) {}
 
 fn main() {
     foo({f: 3});
@@ -13,7 +14,8 @@ fn main() {
     foo(~mut 1); //! ERROR missing `const`
     foo(@1);
     foo(@mut 1); //! ERROR missing `const`
-    foo(r(1)); //! ERROR missing `const`
+    foo(r(1)); // this is okay now.
+    foo(r2(@mut 1)); //! ERROR missing `const`
     foo("123");
     foo({f: {mut f: 1}}); //! ERROR missing `const`
 }