about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Schneider <github35764891676564198441@oli-obk.de>2018-10-03 11:46:05 +0200
committerOliver Schneider <github35764891676564198441@oli-obk.de>2018-10-03 11:46:05 +0200
commitc793391e6d04106df57a4f431c7deeb4258a0592 (patch)
tree23b4c8a4474c80d556433220aa99b5a2ca78b49a
parentf5106a23c3e045f921a181249eb48e48969299c7 (diff)
downloadrust-c793391e6d04106df57a4f431c7deeb4258a0592.tar.gz
rust-c793391e6d04106df57a4f431c7deeb4258a0592.zip
Move platform dependent output ui tests to compile-fail
-rw-r--r--src/test/compile-fail/const-fn-error.rs (renamed from src/test/ui/consts/const-fn-error.rs)0
-rw-r--r--src/test/compile-fail/issue-52443.rs (renamed from src/test/ui/consts/const-eval/issue-52443.rs)0
-rw-r--r--src/test/ui/consts/const-eval/issue-52443.stderr72
-rw-r--r--src/test/ui/consts/const-fn-error.stderr64
4 files changed, 0 insertions, 136 deletions
diff --git a/src/test/ui/consts/const-fn-error.rs b/src/test/compile-fail/const-fn-error.rs
index 6eda41730b3..6eda41730b3 100644
--- a/src/test/ui/consts/const-fn-error.rs
+++ b/src/test/compile-fail/const-fn-error.rs
diff --git a/src/test/ui/consts/const-eval/issue-52443.rs b/src/test/compile-fail/issue-52443.rs
index 2ae94f6d642..2ae94f6d642 100644
--- a/src/test/ui/consts/const-eval/issue-52443.rs
+++ b/src/test/compile-fail/issue-52443.rs
diff --git a/src/test/ui/consts/const-eval/issue-52443.stderr b/src/test/ui/consts/const-eval/issue-52443.stderr
deleted file mode 100644
index 8c6beda6fb9..00000000000
--- a/src/test/ui/consts/const-eval/issue-52443.stderr
+++ /dev/null
@@ -1,72 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/issue-52443.rs:12:10
-   |
-LL |     [(); & { loop { continue } } ]; //~ ERROR mismatched types
-   |          ^^^^^^^^^^^^^^^^^^^^^^^
-   |          |
-   |          expected usize, found reference
-   |          help: consider removing the borrow: `{ loop { continue } }`
-   |
-   = note: expected type `usize`
-              found type `&_`
-
-error[E0308]: mismatched types
-  --> $DIR/issue-52443.rs:13:17
-   |
-LL |     [(); loop { break }]; //~ ERROR mismatched types
-   |                 ^^^^^ expected (), found usize
-   |
-   = note: expected type `()`
-              found type `usize`
-
-error[E0019]: constant contains unimplemented expression type
-  --> $DIR/issue-52443.rs:14:11
-   |
-LL |     [(); {while true {break}; 0}]; //~ ERROR constant contains unimplemented expression type
-   |           ^^^^^^^^^^^^^^^^^^
-
-error[E0015]: calls in constants are limited to constant functions, tuple structs and tuple variants
-  --> $DIR/issue-52443.rs:15:21
-   |
-LL |     [(); { for _ in 0usize.. {}; 0}]; //~ ERROR calls in constants are limited to constant functions
-   |                     ^^^^^^^^
-
-error[E0019]: constant contains unimplemented expression type
-  --> $DIR/issue-52443.rs:15:21
-   |
-LL |     [(); { for _ in 0usize.. {}; 0}]; //~ ERROR calls in constants are limited to constant functions
-   |                     ^^^^^^^^
-
-error[E0080]: could not evaluate repeat length
-  --> $DIR/issue-52443.rs:15:10
-   |
-LL |     [(); { for _ in 0usize.. {}; 0}]; //~ ERROR calls in constants are limited to constant functions
-   |          ^^^^^^^^^^^--------^^^^^^^
-   |                     |
-   |                     inside call to `std::iter::range::<impl std::iter::Iterator for std::ops::RangeFrom<A>><usize>::next`
-   | 
-  ::: $SRC_DIR/libcore/ptr.rs:LL:COL
-   |
-LL |         let z = read(x);
-   |                 ------- inside call to `std::ptr::read::<usize>`
-...
-LL |     let mut tmp: T = mem::uninitialized();
-   |                      -------------------- inside call to `std::mem::uninitialized::<usize>`
-   | 
-  ::: $SRC_DIR/libcore/iter/range.rs:LL:COL
-   |
-LL |         mem::swap(&mut n, &mut self.start);
-   |         ---------------------------------- inside call to `std::mem::swap::<usize>`
-   | 
-  ::: $SRC_DIR/libcore/mem.rs:LL:COL
-   |
-LL |     intrinsics::uninit()
-   |     -------------------- "calling intrinsic `uninit`" needs an rfc before being allowed inside constants
-...
-LL |         ptr::swap_nonoverlapping_one(x, y);
-   |         ---------------------------------- inside call to `std::ptr::swap_nonoverlapping_one::<usize>`
-
-error: aborting due to 6 previous errors
-
-Some errors occurred: E0015, E0019, E0080, E0308.
-For more information about an error, try `rustc --explain E0015`.
diff --git a/src/test/ui/consts/const-fn-error.stderr b/src/test/ui/consts/const-fn-error.stderr
deleted file mode 100644
index 439493a1e80..00000000000
--- a/src/test/ui/consts/const-fn-error.stderr
+++ /dev/null
@@ -1,64 +0,0 @@
-error[E0658]: let bindings in constant functions are unstable (see issue #48821)
-  --> $DIR/const-fn-error.rs:16:19
-   |
-LL |     let mut sum = 0;
-   |                   ^
-   |
-   = help: add #![feature(const_let)] to the crate attributes to enable
-
-error[E0658]: statements in constant functions are unstable (see issue #48821)
-  --> $DIR/const-fn-error.rs:16:19
-   |
-LL |     let mut sum = 0;
-   |                   ^
-   |
-   = help: add #![feature(const_let)] to the crate attributes to enable
-
-error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants
-  --> $DIR/const-fn-error.rs:19:14
-   |
-LL |     for i in 0..x {
-   |              ^^^^
-
-error[E0019]: constant function contains unimplemented expression type
-  --> $DIR/const-fn-error.rs:19:14
-   |
-LL |     for i in 0..x {
-   |              ^^^^
-
-error[E0080]: could not evaluate constant expression
-  --> $DIR/const-fn-error.rs:29:13
-   |
-LL |     for i in 0..x {
-   |              ---- inside call to `std::iter::range::<impl std::iter::Iterator for std::ops::Range<A>><usize>::next`
-...
-LL |     let a : [i32; f(X)]; //~ ERROR E0080
-   |             ^^^^^^----^
-   |                   |
-   |                   inside call to `f`
-   | 
-  ::: $SRC_DIR/libcore/ptr.rs:LL:COL
-   |
-LL |         let z = read(x);
-   |                 ------- inside call to `std::ptr::read::<usize>`
-...
-LL |     let mut tmp: T = mem::uninitialized();
-   |                      -------------------- inside call to `std::mem::uninitialized::<usize>`
-   | 
-  ::: $SRC_DIR/libcore/iter/range.rs:LL:COL
-   |
-LL |                 mem::swap(&mut n, &mut self.start);
-   |                 ---------------------------------- inside call to `std::mem::swap::<usize>`
-   | 
-  ::: $SRC_DIR/libcore/mem.rs:LL:COL
-   |
-LL |     intrinsics::uninit()
-   |     -------------------- "calling intrinsic `uninit`" needs an rfc before being allowed inside constants
-...
-LL |         ptr::swap_nonoverlapping_one(x, y);
-   |         ---------------------------------- inside call to `std::ptr::swap_nonoverlapping_one::<usize>`
-
-error: aborting due to 5 previous errors
-
-Some errors occurred: E0015, E0019, E0080, E0658.
-For more information about an error, try `rustc --explain E0015`.