---

yaml
---
r: 39247
b: refs/heads/incoming
c: fe9a339
h: refs/heads/master
i:
  39245: 0e954e0
  39243: e7a85ea
  39239: bc77192
  39231: 7d36f5d
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 00278742180faa2f2487e651f854eff133187a0e
+refs/heads/incoming: fe9a339939e27e8cb617c04a80661297d47e4d70
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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() {
+    
+}

branches/incoming/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;
+}

branches/incoming/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();
+}

branches/incoming/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(&());
+}