From d062896a8bb224f97c9bac804d40b5406a3ac993 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 18 Dec 2012 14:35:44 -0800
Subject: [PATCH] Deal with test failures in various ways

---
 src/test/compile-fail/alt-vec-illegal-tail-loan.rs | 2 ++
 src/test/compile-fail/bind-by-move-no-lvalues-1.rs | 2 ++
 src/test/compile-fail/bind-by-move-no-lvalues-2.rs | 2 ++
 src/test/compile-fail/borrowck-autoref-3261.rs     | 4 ++--
 src/test/compile-fail/lint-default-methods.rs      | 4 ++--
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/test/compile-fail/alt-vec-illegal-tail-loan.rs b/src/test/compile-fail/alt-vec-illegal-tail-loan.rs
index 29c1d2a78a3..01f27077216 100644
--- a/src/test/compile-fail/alt-vec-illegal-tail-loan.rs
+++ b/src/test/compile-fail/alt-vec-illegal-tail-loan.rs
@@ -1,3 +1,5 @@
+// xfail-test
+
 fn a() -> &[int] {
     let vec = [1, 2, 3, 4];
     let tail = match vec {
diff --git a/src/test/compile-fail/bind-by-move-no-lvalues-1.rs b/src/test/compile-fail/bind-by-move-no-lvalues-1.rs
index 4424061e217..391f1e51180 100644
--- a/src/test/compile-fail/bind-by-move-no-lvalues-1.rs
+++ b/src/test/compile-fail/bind-by-move-no-lvalues-1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test
+
 struct X { x: (), }
 
 impl X : Drop {
diff --git a/src/test/compile-fail/bind-by-move-no-lvalues-2.rs b/src/test/compile-fail/bind-by-move-no-lvalues-2.rs
index 1a0c7764dc1..0c1856a334c 100644
--- a/src/test/compile-fail/bind-by-move-no-lvalues-2.rs
+++ b/src/test/compile-fail/bind-by-move-no-lvalues-2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test
+
 struct X { x: (), }
 
 impl X : Drop {
diff --git a/src/test/compile-fail/borrowck-autoref-3261.rs b/src/test/compile-fail/borrowck-autoref-3261.rs
index 2f46cc9fc03..6c6f59d00ea 100644
--- a/src/test/compile-fail/borrowck-autoref-3261.rs
+++ b/src/test/compile-fail/borrowck-autoref-3261.rs
@@ -19,9 +19,9 @@ fn main() {
     let mut x = X(Right(main));
     do (&mut x).with |opt| {  //~ ERROR illegal borrow
         match opt {
-            &Right(f) => {
+            &Right(ref f) => {
                 x = X(Left((0,0)));
-                f()
+                (*f)()
             },
             _ => fail
         }
diff --git a/src/test/compile-fail/lint-default-methods.rs b/src/test/compile-fail/lint-default-methods.rs
index 97662225dec..6b71f9e972f 100644
--- a/src/test/compile-fail/lint-default-methods.rs
+++ b/src/test/compile-fail/lint-default-methods.rs
@@ -1,7 +1,7 @@
 #[forbid(default_methods)];
 
-trait Foo {
-    fn bar() { io::println("hi"); } //~ ERROR default methods are experimental
+trait Foo { //~ ERROR default methods are experimental
+    fn bar() { io::println("hi"); }
 }
 
 fn main() {}