about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvarkor <github@varkor.com>2018-11-06 22:19:07 +0000
committervarkor <github@varkor.com>2018-12-11 11:18:55 +0000
commit4d8a6eac397a4acdd5965c4c9f04d236ada2e266 (patch)
tree95575ae03dcc24d39df391759ed84c689afd29e6
parent210e2347335dbb097aefcd8f3002a0c4e72aa9ed (diff)
downloadrust-4d8a6eac397a4acdd5965c4c9f04d236ada2e266.tar.gz
rust-4d8a6eac397a4acdd5965c4c9f04d236ada2e266.zip
Fix some misbehaving tests
-rw-r--r--src/test/run-pass/binding/empty-types-in-patterns.rs1
-rw-r--r--src/test/run-pass/issues/issue-41696.rs1
-rw-r--r--src/test/ui/consts/const-eval/ub-uninhabit.stderr6
3 files changed, 5 insertions, 3 deletions
diff --git a/src/test/run-pass/binding/empty-types-in-patterns.rs b/src/test/run-pass/binding/empty-types-in-patterns.rs
index 7fb7eec1256..f595bb0da9a 100644
--- a/src/test/run-pass/binding/empty-types-in-patterns.rs
+++ b/src/test/run-pass/binding/empty-types-in-patterns.rs
@@ -14,6 +14,7 @@
 #![feature(slice_patterns)]
 #![allow(unreachable_patterns)]
 #![allow(unreachable_code)]
+#![allow(unused_variables)]
 
 #[allow(dead_code)]
 fn foo(z: !) {
diff --git a/src/test/run-pass/issues/issue-41696.rs b/src/test/run-pass/issues/issue-41696.rs
index 3937f9c1930..5a5a2adc124 100644
--- a/src/test/run-pass/issues/issue-41696.rs
+++ b/src/test/run-pass/issues/issue-41696.rs
@@ -11,6 +11,7 @@
 // run-pass
 #![allow(dead_code)]
 #![allow(unused_variables)]
+#![recursion_limit = "128"]
 // this used to cause exponential code-size blowup during LLVM passes.
 
 #![feature(test)]
diff --git a/src/test/ui/consts/const-eval/ub-uninhabit.stderr b/src/test/ui/consts/const-eval/ub-uninhabit.stderr
index 5d6b87c392b..c8842ecc23c 100644
--- a/src/test/ui/consts/const-eval/ub-uninhabit.stderr
+++ b/src/test/ui/consts/const-eval/ub-uninhabit.stderr
@@ -1,5 +1,5 @@
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-uninhabit.rs:13:1
+  --> $DIR/ub-uninhabit.rs:14:1
    |
 LL | const BAD_BAD_BAD: Bar = unsafe { (TransmuteUnion::<(), Bar> { a: () }).b };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type
@@ -7,7 +7,7 @@ LL | const BAD_BAD_BAD: Bar = unsafe { (TransmuteUnion::<(), Bar> { a: () }).b }
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-uninhabit.rs:16:1
+  --> $DIR/ub-uninhabit.rs:17:1
    |
 LL | const BAD_BAD_REF: &Bar = unsafe { mem::transmute(1usize) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type at .<deref>
@@ -15,7 +15,7 @@ LL | const BAD_BAD_REF: &Bar = unsafe { mem::transmute(1usize) };
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-uninhabit.rs:19:1
+  --> $DIR/ub-uninhabit.rs:20:1
    |
 LL | const BAD_BAD_ARRAY: [Bar; 1] = unsafe { (TransmuteUnion::<(), [Bar; 1]> { a: () }).b };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type