---

yaml
---
r: 29923
b: refs/heads/incoming
c: fcb055e
h: refs/heads/master
i:
  29921: cbdc03f
  29919: c49713b
v: v3

Author: nikomatsakis

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 4b1d83ca6494d10cb1ffaf50032e0a2d833ad635
+refs/heads/incoming: fcb055ef7e030c3cb057a375e3fd7dfc65777137
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs

@@ -0,0 +1,9 @@
+struct defer {
+    x: &[&str];
+    new(x: &[&str]) { self.x = x; }
+    drop { #error["%?", self.x]; }
+}
+
+fn main() {
+    let _x = defer(~["Goodbye", "world!"]); //~ ERROR illegal borrow
+}

branches/incoming/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs

@@ -0,0 +1,13 @@
+//buggy.rs
+use std;
+import std::map::hashmap;
+import std::map;
+
+fn main() {
+    let buggy_map :hashmap<uint, &uint> = hashmap::<uint, &uint>(uint::hash, uint::eq);
+    buggy_map.insert(42, ~1); //~ ERROR illegal borrow
+    
+    // but it is ok if we use a temporary
+    let tmp = ~2;
+    buggy_map.insert(43, tmp);
+}

branches/incoming/src/test/compile-fail/borrowck-ref-into-rvalue.rs

@@ -0,0 +1,11 @@
+fn main() {
+    let msg;
+    match some(~"Hello") { //~ ERROR illegal borrow
+        some(ref m) => {
+            msg = m;
+        },  
+        none => { fail }
+    }   
+    io::println(*msg);
+}
+