Move /src/test to /tests

22 files changed, 0 insertions, 318 deletions

diff --git a/src/test/ui/parser/diff-markers/enum-2.rs b/src/test/ui/parser/diff-markers/enum-2.rs
deleted file mode 100644
index 76ea980fc62..00000000000
--- a/src/test/ui/parser/diff-markers/enum-2.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-enum E {
-    Foo {
-<<<<<<< HEAD //~ ERROR encountered diff marker
-        x: u8,
-|||||||
-        z: (),
-=======
-        y: i8,
->>>>>>> branch
-    }
-}
diff --git a/src/test/ui/parser/diff-markers/enum-2.stderr b/src/test/ui/parser/diff-markers/enum-2.stderr
deleted file mode 100644
index 63da5c2a6e1..00000000000
--- a/src/test/ui/parser/diff-markers/enum-2.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error: encountered diff marker
-  --> $DIR/enum-2.rs:3:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL |         x: u8,
-LL | |||||||
-   | -------
-LL |         z: (),
-LL | =======
-   | -------
-LL |         y: i8,
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/enum.rs b/src/test/ui/parser/diff-markers/enum.rs
deleted file mode 100644
index 45df6e3251d..00000000000
--- a/src/test/ui/parser/diff-markers/enum.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-enum E {
-<<<<<<< HEAD //~ ERROR encountered diff marker
-    Foo(u8),
-=======
-    Bar(i8),
->>>>>>> branch
-}
diff --git a/src/test/ui/parser/diff-markers/enum.stderr b/src/test/ui/parser/diff-markers/enum.stderr
deleted file mode 100644
index abbf3fb41e7..00000000000
--- a/src/test/ui/parser/diff-markers/enum.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/enum.rs:2:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL |     Foo(u8),
-LL | =======
-   | -------
-LL |     Bar(i8),
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/fn-arg.rs b/src/test/ui/parser/diff-markers/fn-arg.rs
deleted file mode 100644
index 86c355628ab..00000000000
--- a/src/test/ui/parser/diff-markers/fn-arg.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-trait T {
-    fn foo(
-<<<<<<< HEAD //~ ERROR encountered diff marker
-        x: u8,
-=======
-        x: i8,
->>>>>>> branch
-    ) {}
-}
-
-struct S;
-impl T for S {}
-
-fn main() {
-    S::foo(42);
-}
diff --git a/src/test/ui/parser/diff-markers/fn-arg.stderr b/src/test/ui/parser/diff-markers/fn-arg.stderr
deleted file mode 100644
index 933a206410e..00000000000
--- a/src/test/ui/parser/diff-markers/fn-arg.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/fn-arg.rs:3:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL |         x: u8,
-LL | =======
-   | -------
-LL |         x: i8,
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/item-with-attr.rs b/src/test/ui/parser/diff-markers/item-with-attr.rs
deleted file mode 100644
index 985907c08b2..00000000000
--- a/src/test/ui/parser/diff-markers/item-with-attr.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#[attribute]
-<<<<<<< HEAD //~ ERROR encountered diff marker
-fn foo() {}
-=======
-fn bar() {}
->>>>>>> branch
-
-fn main() {
-    foo();
-}
diff --git a/src/test/ui/parser/diff-markers/item-with-attr.stderr b/src/test/ui/parser/diff-markers/item-with-attr.stderr
deleted file mode 100644
index 850e2368e55..00000000000
--- a/src/test/ui/parser/diff-markers/item-with-attr.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/item-with-attr.rs:2:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL | fn foo() {}
-LL | =======
-   | -------
-LL | fn bar() {}
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/item.rs b/src/test/ui/parser/diff-markers/item.rs
deleted file mode 100644
index 4ed36b7b42b..00000000000
--- a/src/test/ui/parser/diff-markers/item.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-<<<<<<< HEAD //~ ERROR encountered diff marker
-fn foo() {}
-=======
-fn bar() {}
->>>>>>> branch
-
-fn main() {
-    foo();
-}
diff --git a/src/test/ui/parser/diff-markers/item.stderr b/src/test/ui/parser/diff-markers/item.stderr
deleted file mode 100644
index 9ab3631a60e..00000000000
--- a/src/test/ui/parser/diff-markers/item.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/item.rs:1:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL | fn foo() {}
-LL | =======
-   | -------
-LL | fn bar() {}
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/statement.rs b/src/test/ui/parser/diff-markers/statement.rs
deleted file mode 100644
index e55d16d3bbb..00000000000
--- a/src/test/ui/parser/diff-markers/statement.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-trait T {
-    fn foo() {}
-    fn bar() {}
-}
-
-struct S;
-impl T for S {}
-
-fn main() {
-<<<<<<< HEAD //~ ERROR encountered diff marker
-    S::foo();
-=======
-    S::bar();
->>>>>>> branch
-}
diff --git a/src/test/ui/parser/diff-markers/statement.stderr b/src/test/ui/parser/diff-markers/statement.stderr
deleted file mode 100644
index 7ca2495b829..00000000000
--- a/src/test/ui/parser/diff-markers/statement.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/statement.rs:10:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL |     S::foo();
-LL | =======
-   | -------
-LL |     S::bar();
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/struct-expr.rs b/src/test/ui/parser/diff-markers/struct-expr.rs
deleted file mode 100644
index 99d2fd662c6..00000000000
--- a/src/test/ui/parser/diff-markers/struct-expr.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-struct S {
-    x: u8,
-}
-fn main() {
-    let _ = S {
-<<<<<<< HEAD //~ ERROR encountered diff marker
-        x: 42,
-=======
-        x: 0,
->>>>>>> branch
-    }
-}
diff --git a/src/test/ui/parser/diff-markers/struct-expr.stderr b/src/test/ui/parser/diff-markers/struct-expr.stderr
deleted file mode 100644
index d70476a9833..00000000000
--- a/src/test/ui/parser/diff-markers/struct-expr.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/struct-expr.rs:6:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL |         x: 42,
-LL | =======
-   | -------
-LL |         x: 0,
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/struct.rs b/src/test/ui/parser/diff-markers/struct.rs
deleted file mode 100644
index d26464d47bc..00000000000
--- a/src/test/ui/parser/diff-markers/struct.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-struct S {
-<<<<<<< HEAD //~ ERROR encountered diff marker
-    x: u8,
-=======
-    x: i8,
->>>>>>> branch
-}
diff --git a/src/test/ui/parser/diff-markers/struct.stderr b/src/test/ui/parser/diff-markers/struct.stderr
deleted file mode 100644
index cc0b3da664e..00000000000
--- a/src/test/ui/parser/diff-markers/struct.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/struct.rs:2:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL |     x: u8,
-LL | =======
-   | -------
-LL |     x: i8,
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/trait-item.rs b/src/test/ui/parser/diff-markers/trait-item.rs
deleted file mode 100644
index 3227c8212c9..00000000000
--- a/src/test/ui/parser/diff-markers/trait-item.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-trait T {
-<<<<<<< HEAD //~ ERROR encountered diff marker
-    fn foo() {}
-=======
-    fn bar() {}
->>>>>>> branch
-}
-
-struct S;
-impl T for S {}
-
-fn main() {
-    S::foo();
-}
diff --git a/src/test/ui/parser/diff-markers/trait-item.stderr b/src/test/ui/parser/diff-markers/trait-item.stderr
deleted file mode 100644
index cdc19f8e076..00000000000
--- a/src/test/ui/parser/diff-markers/trait-item.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/trait-item.rs:2:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL |     fn foo() {}
-LL | =======
-   | -------
-LL |     fn bar() {}
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/tuple-struct.rs b/src/test/ui/parser/diff-markers/tuple-struct.rs
deleted file mode 100644
index 7eec35c968d..00000000000
--- a/src/test/ui/parser/diff-markers/tuple-struct.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-struct S(
-<<<<<<< HEAD //~ ERROR encountered diff marker
-    u8,
-=======
-    i8,
->>>>>>> branch
-);
diff --git a/src/test/ui/parser/diff-markers/tuple-struct.stderr b/src/test/ui/parser/diff-markers/tuple-struct.stderr
deleted file mode 100644
index d673db89837..00000000000
--- a/src/test/ui/parser/diff-markers/tuple-struct.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/tuple-struct.rs:2:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL |     u8,
-LL | =======
-   | -------
-LL |     i8,
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/diff-markers/use-statement.rs b/src/test/ui/parser/diff-markers/use-statement.rs
deleted file mode 100644
index 6306243a514..00000000000
--- a/src/test/ui/parser/diff-markers/use-statement.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use foo::{
-<<<<<<< HEAD //~ ERROR encountered diff marker
-    bar,
-=======
-    baz,
->>>>>>> branch
-};
-
-fn main() {}
diff --git a/src/test/ui/parser/diff-markers/use-statement.stderr b/src/test/ui/parser/diff-markers/use-statement.stderr
deleted file mode 100644
index 12e6f57dd50..00000000000
--- a/src/test/ui/parser/diff-markers/use-statement.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: encountered diff marker
-  --> $DIR/use-statement.rs:2:1
-   |
-LL | <<<<<<< HEAD
-   | ^^^^^^^ after this is the code before the merge
-LL |     bar,
-LL | =======
-   | -------
-LL |     baz,
-LL | >>>>>>> branch
-   | ^^^^^^^ above this are the incoming code changes
-   |
-   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
-   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
-   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
-
-error: aborting due to previous error
-