From 14e4a4224542a56bfa47fabefecde8fd818dba6c Mon Sep 17 00:00:00 2001
From: Crazycolorz5 <Crazycolorz5@gmail.com>
Date: Mon, 4 Jun 2018 22:35:39 -0400
Subject: [PATCH] Changed a few tests, and changed the folder of a few of them.

---
 src/test/compile-fail/issue-39616.rs                            | 2 +-
 .../privacy/restricted => ui}/tuple-struct-fields/test.rs       | 2 +-
 .../privacy/restricted => ui}/tuple-struct-fields/test2.rs      | 2 +-
 .../privacy/restricted => ui}/tuple-struct-fields/test3.rs      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/test/{compile-fail/privacy/restricted => ui}/tuple-struct-fields/test.rs (92%)
 rename src/test/{compile-fail/privacy/restricted => ui}/tuple-struct-fields/test2.rs (92%)
 rename src/test/{compile-fail/privacy/restricted => ui}/tuple-struct-fields/test3.rs (92%)

diff --git a/src/test/compile-fail/issue-39616.rs b/src/test/compile-fail/issue-39616.rs
index d601249c036..e5d0cbe34f3 100644
--- a/src/test/compile-fail/issue-39616.rs
+++ b/src/test/compile-fail/issue-39616.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 fn foo(a: [0; 1]) {} //~ ERROR expected type, found `0`
-//~| ERROR expected one of `->`, `where`, or `{`, found `]`
+//~| ERROR expected one of `)`, `->`, `where`, or `{`, found `]`
 // FIXME(jseyfried): avoid emitting the second error (preexisting)
 
 fn main() {}
diff --git a/src/test/compile-fail/privacy/restricted/tuple-struct-fields/test.rs b/src/test/ui/tuple-struct-fields/test.rs
similarity index 92%
rename from src/test/compile-fail/privacy/restricted/tuple-struct-fields/test.rs
rename to src/test/ui/tuple-struct-fields/test.rs
index d4ea76d6c26..22d54a38340 100644
--- a/src/test/compile-fail/privacy/restricted/tuple-struct-fields/test.rs
+++ b/src/test/ui/tuple-struct-fields/test.rs
@@ -12,6 +12,6 @@ mod foo {
     type T = ();
     struct S1(pub(in foo) (), pub(T), pub(crate) (), pub(((), T)));
     struct S2(pub((foo)) ());
-    //~^ ERROR expected `,`, found `(`
+    //~^ ERROR expected one of `)` or `,`, found `(`
     //~| ERROR cannot find type `foo` in this scope
 }
diff --git a/src/test/compile-fail/privacy/restricted/tuple-struct-fields/test2.rs b/src/test/ui/tuple-struct-fields/test2.rs
similarity index 92%
rename from src/test/compile-fail/privacy/restricted/tuple-struct-fields/test2.rs
rename to src/test/ui/tuple-struct-fields/test2.rs
index fed9432c6a0..eead027cb13 100644
--- a/src/test/compile-fail/privacy/restricted/tuple-struct-fields/test2.rs
+++ b/src/test/ui/tuple-struct-fields/test2.rs
@@ -13,7 +13,7 @@ macro_rules! define_struct {
         struct S1(pub $t);
         struct S2(pub (in foo) ());
         struct S3(pub $t ());
-        //~^ ERROR expected `,`, found `(`
+        //~^ ERROR expected one of `)` or `,`, found `(`
     }
 }
 
diff --git a/src/test/compile-fail/privacy/restricted/tuple-struct-fields/test3.rs b/src/test/ui/tuple-struct-fields/test3.rs
similarity index 92%
rename from src/test/compile-fail/privacy/restricted/tuple-struct-fields/test3.rs
rename to src/test/ui/tuple-struct-fields/test3.rs
index dd2cb0e2184..d666c8abd3c 100644
--- a/src/test/compile-fail/privacy/restricted/tuple-struct-fields/test3.rs
+++ b/src/test/ui/tuple-struct-fields/test3.rs
@@ -13,7 +13,7 @@ macro_rules! define_struct {
         struct S1(pub($t));
         struct S2(pub (in foo) ());
         struct S3(pub($t) ());
-        //~^ ERROR expected `,`, found `(`
+        //~^ ERROR expected one of `)` or `,`, found `(`
     }
 }