summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2019-04-09 22:08:57 +0200
committerRalf Jung <post@ralfj.de>2019-04-14 10:01:32 +0200
commit3a39b431e87807bea03d17df98ddb71f82bfc6d5 (patch)
tree7af0061e1690faaf0c91c87da06ea79576dbe4db
parent6cd7c8b04a83ed1f2900dbcbeaae8f5e91a9cb35 (diff)
downloadrust-3a39b431e87807bea03d17df98ddb71f82bfc6d5.tar.gz
normalize away spurious error
-rw-r--r--src/test/ui/duplicate/dupe-symbols-7.rs4
-rw-r--r--src/test/ui/duplicate/dupe-symbols-7.stderr2
-rw-r--r--src/test/ui/huge-array.rs4
-rw-r--r--src/test/ui/issues/issue-15919.rs4
-rw-r--r--src/test/ui/issues/issue-17913.rs4
-rw-r--r--src/test/ui/linkage2.rs4
-rw-r--r--src/test/ui/linkage2.stderr2
-rw-r--r--src/test/ui/linkage3.rs4
-rw-r--r--src/test/ui/linkage3.stderr2
9 files changed, 27 insertions, 3 deletions
diff --git a/src/test/ui/duplicate/dupe-symbols-7.rs b/src/test/ui/duplicate/dupe-symbols-7.rs
index b28f1a40fe9..b838aaa102e 100644
--- a/src/test/ui/duplicate/dupe-symbols-7.rs
+++ b/src/test/ui/duplicate/dupe-symbols-7.rs
@@ -1,5 +1,9 @@
//
// error-pattern: entry symbol `main` defined multiple times
+
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
#![allow(warnings)]
#[no_mangle]
diff --git a/src/test/ui/duplicate/dupe-symbols-7.stderr b/src/test/ui/duplicate/dupe-symbols-7.stderr
index a1dbbb0c685..7d033ec3d85 100644
--- a/src/test/ui/duplicate/dupe-symbols-7.stderr
+++ b/src/test/ui/duplicate/dupe-symbols-7.stderr
@@ -1,5 +1,5 @@
error: entry symbol `main` defined multiple times
- --> $DIR/dupe-symbols-7.rs:6:1
+ --> $DIR/dupe-symbols-7.rs:10:1
|
LL | fn main(){}
| ^^^^^^^^^^^
diff --git a/src/test/ui/huge-array.rs b/src/test/ui/huge-array.rs
index 0608b23dac6..f58dcd58067 100644
--- a/src/test/ui/huge-array.rs
+++ b/src/test/ui/huge-array.rs
@@ -1,5 +1,9 @@
// error-pattern:; 1518600000
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+
fn generic<T: Copy>(t: T) {
let s: [T; 1518600000] = [t; 1518600000];
}
diff --git a/src/test/ui/issues/issue-15919.rs b/src/test/ui/issues/issue-15919.rs
index 19ecf2f657e..a7ac4802a12 100644
--- a/src/test/ui/issues/issue-15919.rs
+++ b/src/test/ui/issues/issue-15919.rs
@@ -1,6 +1,10 @@
// error-pattern: too big for the current architecture
// normalize-stderr-test "\[usize; \d+\]" -> "[usize; N]"
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+
#[cfg(target_pointer_width = "32")]
fn main() {
let x = [0usize; 0xffff_ffff];
diff --git a/src/test/ui/issues/issue-17913.rs b/src/test/ui/issues/issue-17913.rs
index b0c4ef54b16..48d8f407aa1 100644
--- a/src/test/ui/issues/issue-17913.rs
+++ b/src/test/ui/issues/issue-17913.rs
@@ -1,6 +1,10 @@
// normalize-stderr-test "\[&usize; \d+\]" -> "[&usize; N]"
// error-pattern: too big for the current architecture
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+
#![feature(box_syntax)]
#[cfg(target_pointer_width = "64")]
diff --git a/src/test/ui/linkage2.rs b/src/test/ui/linkage2.rs
index 6d1410a90bd..fa4221fb339 100644
--- a/src/test/ui/linkage2.rs
+++ b/src/test/ui/linkage2.rs
@@ -1,3 +1,7 @@
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+
#![feature(linkage)]
extern {
diff --git a/src/test/ui/linkage2.stderr b/src/test/ui/linkage2.stderr
index 64213f1270a..c72978388eb 100644
--- a/src/test/ui/linkage2.stderr
+++ b/src/test/ui/linkage2.stderr
@@ -1,5 +1,5 @@
error: must have type `*const T` or `*mut T`
- --> $DIR/linkage2.rs:4:32
+ --> $DIR/linkage2.rs:8:32
|
LL | #[linkage = "extern_weak"] static foo: i32;
| ^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/linkage3.rs b/src/test/ui/linkage3.rs
index f094a0d53e9..1462079acf7 100644
--- a/src/test/ui/linkage3.rs
+++ b/src/test/ui/linkage3.rs
@@ -1,3 +1,7 @@
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+
#![feature(linkage)]
extern {
diff --git a/src/test/ui/linkage3.stderr b/src/test/ui/linkage3.stderr
index a03593ff2c6..b74fdc91429 100644
--- a/src/test/ui/linkage3.stderr
+++ b/src/test/ui/linkage3.stderr
@@ -1,5 +1,5 @@
error: invalid linkage specified
- --> $DIR/linkage3.rs:4:24
+ --> $DIR/linkage3.rs:8:24
|
LL | #[linkage = "foo"] static foo: *const i32;
| ^^^^^^^^^^^^^^^^^^^^^^^