---

yaml
---
r: 3401
b: refs/heads/master
c: fb14afd
h: refs/heads/master
i:
  3399: 65b84f6
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07125aa38b0fd14ada84da43c874b798a2767840
+refs/heads/master: fb14afd5eb8ab19f08e37e295fb207f0a1bb8e23

trunk/src/comp/middle/trans.rs

@@ -3137,7 +3137,7 @@ fn copy_val(&@block_ctxt cx, copy_action action, ValueRef dst, ValueRef src,
     // FIXME this is just a clunky stopgap. we should do proper checking in an
     // earlier pass.
     if (!ty::type_is_copyable(ccx.tcx, t)) {
-        ccx.sess.span_err(cx.sp, "Copying a non-copyable type.");
+        ccx.sess.span_fatal(cx.sp, "Copying a non-copyable type.");
     }
 
     if (ty::type_is_scalar(ccx.tcx, t) ||

trunk/src/test/compile-fail/copy-a-resource.rs

@@ -0,0 +1,8 @@
+// error-pattern:Copying a non-copyable type
+
+res foo(int i) {}
+
+fn main() {
+    auto x <- foo(10);
+    auto y = x;
+}

trunk/src/test/run-pass/resource-destruct.rs

@@ -0,0 +1,16 @@
+res shrinky_pointer(@mutable int i) {
+    *i -= 1;
+}
+
+fn look_at(&shrinky_pointer pt) -> int {
+    ret **pt;
+}
+
+fn main() {
+    auto my_total = @mutable 10;
+    {
+        auto pt <- shrinky_pointer(my_total);
+        assert (look_at(pt) == 10);
+    }
+    assert (*my_total == 9);
+}