about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDavid Wood <david@davidtw.co>2018-08-09 18:11:35 +0200
committerDavid Wood <david@davidtw.co>2018-08-14 11:12:11 +0200
commita92264245521fea1b1c5e4cd4ce168432bec3d5a (patch)
treebe03e2436a8a5e5d493a3bce82733b05888cbd7c /src
parent7c13eb42d473f2b49fa38203d510fb050e4e526d (diff)
Moved tests back to compile-test if they don't work on ui.
Diffstat (limited to 'src')
-rw-r--r--src/test/compile-fail/coerce-unsafe-to-closure.rs (renamed from src/test/ui/coercion/coerce-unsafe-to-closure.rs)0
-rw-r--r--src/test/compile-fail/issue-46209-private-enum-variant-reexport.rs (renamed from src/test/ui/issues/issue-46209-private-enum-variant-reexport.rs)0
-rw-r--r--src/test/compile-fail/meta-expected-error-wrong-rev.rs (renamed from src/test/ui/meta-expected-error-wrong-rev.rs)0
-rw-r--r--src/test/ui/coercion/coerce-unsafe-to-closure.stderr9
-rw-r--r--src/test/ui/invalid-module-declaration/invalid-module-declaration.rs3
-rw-r--r--src/test/ui/issues/issue-46209-private-enum-variant-reexport.stderr44
-rw-r--r--src/test/ui/meta-expected-error-wrong-rev.a.stderr9
7 files changed, 0 insertions, 65 deletions
diff --git a/src/test/ui/coercion/coerce-unsafe-to-closure.rs b/src/test/compile-fail/coerce-unsafe-to-closure.rs
index 90cbbf242aa..90cbbf242aa 100644
--- a/src/test/ui/coercion/coerce-unsafe-to-closure.rs
+++ b/src/test/compile-fail/coerce-unsafe-to-closure.rs
diff --git a/src/test/ui/issues/issue-46209-private-enum-variant-reexport.rs b/src/test/compile-fail/issue-46209-private-enum-variant-reexport.rs
index f5a20dd96dc..f5a20dd96dc 100644
--- a/src/test/ui/issues/issue-46209-private-enum-variant-reexport.rs
+++ b/src/test/compile-fail/issue-46209-private-enum-variant-reexport.rs
diff --git a/src/test/ui/meta-expected-error-wrong-rev.rs b/src/test/compile-fail/meta-expected-error-wrong-rev.rs
index 8869e950b3a..8869e950b3a 100644
--- a/src/test/ui/meta-expected-error-wrong-rev.rs
+++ b/src/test/compile-fail/meta-expected-error-wrong-rev.rs
diff --git a/src/test/ui/coercion/coerce-unsafe-to-closure.stderr b/src/test/ui/coercion/coerce-unsafe-to-closure.stderr
deleted file mode 100644
index bf355b4e9d9..00000000000
--- a/src/test/ui/coercion/coerce-unsafe-to-closure.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0277]: the trait bound `unsafe extern "rust-intrinsic" fn(_) -> _ {std::mem::transmute::<_, _>}: std::ops::FnOnce<(&str,)>` is not satisfied
-  --> $DIR/coerce-unsafe-to-closure.rs:12:40
-   |
-LL |     let x: Option<&[u8]> = Some("foo").map(std::mem::transmute);
-   |                                        ^^^ the trait `std::ops::FnOnce<(&str,)>` is not implemented for `unsafe extern "rust-intrinsic" fn(_) -> _ {std::mem::transmute::<_, _>}`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs b/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs
index 18ca5d09798..c0a10fe3e60 100644
--- a/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs
+++ b/src/test/ui/invalid-module-declaration/invalid-module-declaration.rs
@@ -11,9 +11,6 @@
 // ignore-tidy-linelength
 // ignore-windows
 
-// error-pattern: cannot declare a new module at this location
-// error-pattern: maybe move this module
-
 mod auxiliary {
     mod foo;
 }
diff --git a/src/test/ui/issues/issue-46209-private-enum-variant-reexport.stderr b/src/test/ui/issues/issue-46209-private-enum-variant-reexport.stderr
deleted file mode 100644
index 9e5abdeaa43..00000000000
--- a/src/test/ui/issues/issue-46209-private-enum-variant-reexport.stderr
+++ /dev/null
@@ -1,44 +0,0 @@
-error: enum is private and its variants cannot be re-exported
-  --> $DIR/issue-46209-private-enum-variant-reexport.rs:19:13
-   |
-LL |     pub use self::PettyOfficer::*;
-   |             ^^^^^^^^^^^^^^^^^^^^^
-...
-LL |     pub(in rank) enum PettyOfficer {
-   |     ------------------------------ help: consider making the enum public: `pub enum PettyOfficer`
-
-error: enum is private and its variants cannot be re-exported
-  --> $DIR/issue-46209-private-enum-variant-reexport.rs:21:13
-   |
-LL |     pub use self::Crewman::*;
-   |             ^^^^^^^^^^^^^^^^
-...
-LL |     crate enum Crewman {
-   |     ------------------ help: consider making the enum public: `pub enum Crewman`
-
-error: enum is private and its variants cannot be re-exported
-  --> $DIR/issue-46209-private-enum-variant-reexport.rs:14:13
-   |
-LL |     pub use self::Professor::*;
-   |             ^^^^^^^^^^^^^^^^^^
-...
-LL |     enum Professor {
-   |     -------------- help: consider making the enum public: `pub enum Professor`
-
-error: variant `JuniorGrade` is private and cannot be re-exported
-  --> $DIR/issue-46209-private-enum-variant-reexport.rs:16:32
-   |
-LL |     pub use self::Lieutenant::{JuniorGrade, Full};
-   |                                ^^^^^^^^^^^
-...
-LL |     enum Lieutenant {
-   |     --------------- help: consider making the enum public: `pub enum Lieutenant`
-
-error: variant `Full` is private and cannot be re-exported
-  --> $DIR/issue-46209-private-enum-variant-reexport.rs:16:45
-   |
-LL |     pub use self::Lieutenant::{JuniorGrade, Full};
-   |                                             ^^^^
-
-error: aborting due to 5 previous errors
-
diff --git a/src/test/ui/meta-expected-error-wrong-rev.a.stderr b/src/test/ui/meta-expected-error-wrong-rev.a.stderr
deleted file mode 100644
index c3c39183c9a..00000000000
--- a/src/test/ui/meta-expected-error-wrong-rev.a.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/meta-expected-error-wrong-rev.rs:23:18
-   |
-LL |     let x: u32 = 22_usize; //[b]~ ERROR mismatched types
-   |                  ^^^^^^^^ expected u32, found usize
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.