---

yaml
---
r: 6380
b: refs/heads/master
c: a7573af
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 196b2b920f9094cb78cc041709b3c3456b020fbd
+refs/heads/master: a7573af59dceeca49f50779b7766ce8b824326fb

trunk/src/test/compile-fail/copy-res-into-tag.rs

@@ -1,5 +1,5 @@
-// Resources can't be copied into other types but still need to be able
-// to find their way into things.
+// Resources can't be copied, but storing into data structures counts
+// as a move unless the stored thing is used afterwards.
 
 resource r(i: @mutable int) {
     *i = *i + 1;
@@ -59,6 +59,14 @@ fn test_box_rec() {
     assert *i == 1;
 }
 
+fn test_obj() {
+    obj o(_f: r) {}
+    let i = @mutable 0;
+    let rr = r(i);
+    { let _oo = o(rr); }
+    assert *i == 1;
+}
+
 fn main() {
     test_box();
     test_rec();
@@ -67,4 +75,5 @@ fn main() {
     test_tup();
     test_unique();
     test_box_rec();
+    test_obj();
 }

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

@@ -1,7 +1,13 @@
-resource r(i: int) {
-}
+resource r(i: @mutable int) { *i += 1; }
 
 fn main() {
-    // Even though this looks like a copy, it's guaranteed not to be
-    let a = r(0);
-}
+    let i = @mutable 0;
+    // Even though these look like copies, they are guaranteed not to be
+    {
+        let a = r(i);
+        let b = (a, 10);
+        let (c, _d) = b;
+        log c;
+    }
+    assert *i == 1;
+}

trunk/src/test/compile-fail/unique-pinned-nocopy-3.rs

@@ -5,21 +5,19 @@ fn u_foo<send T>(unique: T) { }
 resource r(i: int) { }
 
 fn main() {
-    // FIXME: passing resources doesn't work?
-    //p_foo(r(10));
-    //p_foo(@r(10));
-    // FIXME: unique boxes not yet supported.
-    // p_foo(~r(10));
+    p_foo(r(10));
+    p_foo(@r(10));
+
+    p_foo(~r(10));
     p_foo(@10);
-    // p_foo(~10);
+    p_foo(~10);
     p_foo(10);
 
-    //s_foo(@r(10));
-    //s_foo(~r(10));
+    s_foo(@r(10));
     s_foo(@10);
-    //s_foo(~10);
+    s_foo(~10);
     s_foo(10);
 
-    //u_foo(~10);
+    u_foo(~10);
     u_foo(10);
 }