---

yaml
---
r: 35389
b: refs/heads/master
c: fe9a339
h: refs/heads/master
i:
  35387: 1191f1f
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 00278742180faa2f2487e651f854eff133187a0e
+refs/heads/master: fe9a339939e27e8cb617c04a80661297d47e4d70
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/test/compile-fail/issue-2951.rs

@@ -0,0 +1,9 @@
+// xfail-test
+fn foo<T, U>(x: T, y: U) {
+    let mut xx = x;
+    xx = y; // error message should mention T and U, not 'a and 'b
+}
+
+fn main() {
+    
+}

trunk/src/test/compile-fail/issue-2969.rs

@@ -0,0 +1,9 @@
+// xfail-test
+fn main()
+{
+// See #2969 -- error message should be improved
+   let mut x = [mut 1, 2, 4];
+   let v : &int = &x[2];
+   x[2] = 6;
+   assert *v == 6;
+}

trunk/src/test/compile-fail/issue-3080.rs

@@ -0,0 +1,9 @@
+// xfail-test
+enum x = ();
+impl x {
+    unsafe fn with() { } // This should fail
+}
+
+fn main() {
+    x(()).with();
+}

trunk/src/test/run-pass/issue-3154.rs

@@ -0,0 +1,11 @@
+struct thing<Q> {
+    x: &Q
+}
+
+fn thing<Q>(x: &Q) -> thing<Q> {
+    thing{ x: x }
+}
+
+fn main() {
+    thing(&());
+}