From 6fd215647ddc0abf0d5b02f567dca125c9df5c31 Mon Sep 17 00:00:00 2001
From: Michael Hewson <michael@michaelhewson.ca>
Date: Tue, 7 Nov 2017 05:16:24 -0500
Subject: [PATCH] Add arbitrary_self_types feature gate error to some tests

---
 src/test/compile-fail/issue-26194.rs            |  1 +
 src/test/compile-fail/ufcs-explicit-self-bad.rs | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/test/compile-fail/issue-26194.rs b/src/test/compile-fail/issue-26194.rs
index 7ddd56229ce..439115a258d 100644
--- a/src/test/compile-fail/issue-26194.rs
+++ b/src/test/compile-fail/issue-26194.rs
@@ -13,6 +13,7 @@ struct S(String);
 impl S {
     fn f(self: *mut S) -> String { self.0 }
     //~^ ERROR invalid `self` type
+    //~| ERROR arbitrary `self` types are unstable
 }
 
 fn main() { S("".to_owned()).f(); }
diff --git a/src/test/compile-fail/ufcs-explicit-self-bad.rs b/src/test/compile-fail/ufcs-explicit-self-bad.rs
index 9c98ead4d19..6fc2828f669 100644
--- a/src/test/compile-fail/ufcs-explicit-self-bad.rs
+++ b/src/test/compile-fail/ufcs-explicit-self-bad.rs
@@ -15,7 +15,9 @@ struct Foo {
 }
 
 impl Foo {
-    fn foo(self: isize, x: isize) -> isize {  //~ ERROR invalid `self` type
+    fn foo(self: isize, x: isize) -> isize {
+        //~^ ERROR invalid `self` type
+        //~| ERROR arbitrary `self` types are unstable
         self.f + x
     }
 }
@@ -25,10 +27,14 @@ struct Bar<T> {
 }
 
 impl<T> Bar<T> {
-    fn foo(self: Bar<isize>, x: isize) -> isize { //~ ERROR invalid `self` type
+    fn foo(self: Bar<isize>, x: isize) -> isize {
+        //~^ ERROR invalid `self` type
+        //~| ERROR arbitrary `self` types are unstable
         x
     }
-    fn bar(self: &Bar<usize>, x: isize) -> isize {   //~ ERROR invalid `self` type
+    fn bar(self: &Bar<usize>, x: isize) -> isize {
+        //~^ ERROR invalid `self` type
+        //~| ERROR arbitrary `self` types are unstable
         x
     }
 }