Skip to content

Commit b112bc5

Browse files
borsbors
committed
Auto merge of rust-lang#113348 - saethlin:metadata-module-not-compiled, r=Nilstrieb
Remove some unnecessary(?) normalization rust-lang#59774 (comment)
2 parents 0d50ab7 + 4e21e9e commit b112bc5

21 files changed

+11
-51
lines changed

Diff for: ‎tests/ui/duplicate/dupe-symbols-7.rs

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
//
44
// error-pattern: entry symbol `main` declared multiple times
55

6-
// FIXME https://github.com/rust-lang/rust/issues/59774
7-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
8-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
96
#![allow(warnings)]
107

118
#[no_mangle]

Diff for: ‎tests/ui/duplicate/dupe-symbols-7.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: entry symbol `main` declared multiple times
2-
--> $DIR/dupe-symbols-7.rs:12:1
2+
--> $DIR/dupe-symbols-7.rs:9:1
33
|
44
LL | fn main(){}
55
| ^^^^^^^^^

Diff for: ‎tests/ui/limits/huge-array-simple-32.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// ignore-64bit
22
// build-fail
33

4-
// FIXME https://github.com/rust-lang/rust/issues/59774
5-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
6-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
74
#![allow(arithmetic_overflow)]
85

96
fn main() {

Diff for: ‎tests/ui/limits/huge-array-simple-32.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: values of the type `[u8; 2147516416]` are too big for the current architecture
2-
--> $DIR/huge-array-simple-32.rs:10:9
2+
--> $DIR/huge-array-simple-32.rs:7:9
33
|
44
LL | let _fat: [u8; (1<<31)+(1<<15)] =
55
| ^^^^

Diff for: ‎tests/ui/limits/huge-array-simple-64.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// build-fail
22
// ignore-32bit
33

4-
// FIXME https://github.com/rust-lang/rust/issues/59774
5-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
6-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
74
#![allow(arithmetic_overflow)]
85

96
fn main() {

Diff for: ‎tests/ui/limits/huge-array-simple-64.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: values of the type `[u8; 2305843011361177600]` are too big for the current architecture
2-
--> $DIR/huge-array-simple-64.rs:10:9
2+
--> $DIR/huge-array-simple-64.rs:7:9
33
|
44
LL | let _fat: [u8; (1<<61)+(1<<31)] =
55
| ^^^^

Diff for: ‎tests/ui/limits/huge-array.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// FIXME https://github.com/rust-lang/rust/issues/59774
2-
31
// build-fail
4-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
5-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
62

73
fn generic<T: Copy>(t: T) {
84
let s: [T; 1518600000] = [t; 1518600000];

Diff for: ‎tests/ui/limits/huge-array.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: values of the type `[[u8; 1518599999]; 1518600000]` are too big for the current architecture
2-
--> $DIR/huge-array.rs:8:9
2+
--> $DIR/huge-array.rs:4:9
33
|
44
LL | let s: [T; 1518600000] = [t; 1518600000];
55
| ^

Diff for: ‎tests/ui/limits/huge-enum.rs

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
// normalize-stderr-test "std::option::Option<\[u32; \d+\]>" -> "TYPE"
33
// normalize-stderr-test "\[u32; \d+\]" -> "TYPE"
44

5-
// FIXME https://github.com/rust-lang/rust/issues/59774
6-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
7-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
8-
95
#[cfg(target_pointer_width = "32")]
106
type BIG = Option<[u32; (1<<29)-1]>;
117

Diff for: ‎tests/ui/limits/huge-enum.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: values of the type `Option<TYPE>` are too big for the current architecture
2-
--> $DIR/huge-enum.rs:16:9
2+
--> $DIR/huge-enum.rs:12:9
33
|
44
LL | let big: BIG = None;
55
| ^^^

Diff for: ‎tests/ui/limits/huge-struct.rs

-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
// normalize-stderr-test "S1M" -> "SXX"
44
// error-pattern: too big for the current
55

6-
// FIXME https://github.com/rust-lang/rust/issues/59774
7-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
8-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
9-
106
struct S32<T> {
117
v0: T,
128
v1: T,

Diff for: ‎tests/ui/limits/huge-struct.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: values of the type `SXX<SXX<SXX<u32>>>` are too big for the current architecture
2-
--> $DIR/huge-struct.rs:50:9
2+
--> $DIR/huge-struct.rs:46:9
33
|
44
LL | let fat: Option<SXX<SXX<SXX<u32>>>> = None;
55
| ^^^

Diff for: ‎tests/ui/limits/issue-15919-32.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
// ignore-64bit
22
// build-fail
33

4-
// FIXME https://github.com/rust-lang/rust/issues/59774
5-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
6-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
7-
84
fn main() {
95
let x = [0usize; 0xffff_ffff]; //~ ERROR too big
106
}

Diff for: ‎tests/ui/limits/issue-15919-32.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: values of the type `[usize; usize::MAX]` are too big for the current architecture
2-
--> $DIR/issue-15919-32.rs:9:9
2+
--> $DIR/issue-15919-32.rs:5:9
33
|
44
LL | let x = [0usize; 0xffff_ffff];
55
| ^

Diff for: ‎tests/ui/limits/issue-15919-64.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
// build-fail
22
// ignore-32bit
33

4-
// FIXME https://github.com/rust-lang/rust/issues/59774
5-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
6-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
7-
84
fn main() {
95
let x = [0usize; 0xffff_ffff_ffff_ffff]; //~ ERROR too big
106
}

Diff for: ‎tests/ui/limits/issue-15919-64.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: values of the type `[usize; usize::MAX]` are too big for the current architecture
2-
--> $DIR/issue-15919-64.rs:9:9
2+
--> $DIR/issue-15919-64.rs:5:9
33
|
44
LL | let x = [0usize; 0xffff_ffff_ffff_ffff];
55
| ^

Diff for: ‎tests/ui/limits/issue-17913.rs

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
// normalize-stderr-test "\[&usize; \d+\]" -> "[&usize; usize::MAX]"
33
// error-pattern: too big for the current architecture
44

5-
// FIXME https://github.com/rust-lang/rust/issues/59774
6-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
7-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
8-
95
#[cfg(target_pointer_width = "64")]
106
fn main() {
117
let n = 0_usize;

Diff for: ‎tests/ui/limits/issue-56762.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// only-x86_64
22

3-
// FIXME https://github.com/rust-lang/rust/issues/59774
4-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
5-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
63
const HUGE_SIZE: usize = !0usize / 8;
74

85

Diff for: ‎tests/ui/limits/issue-56762.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0080]: values of the type `[u8; 2305843009213693951]` are too big for the current architecture
2-
--> $DIR/issue-56762.rs:19:1
2+
--> $DIR/issue-56762.rs:16:1
33
|
44
LL | static MY_TOO_BIG_ARRAY_1: TooBigArray = TooBigArray::new();
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error[E0080]: values of the type `[u8; 2305843009213693951]` are too big for the current architecture
8-
--> $DIR/issue-56762.rs:21:1
8+
--> $DIR/issue-56762.rs:18:1
99
|
1010
LL | static MY_TOO_BIG_ARRAY_2: [u8; HUGE_SIZE] = [0x00; HUGE_SIZE];
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Diff for: ‎tests/ui/linkage-attr/linkage3.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
// FIXME https://github.com/rust-lang/rust/issues/59774
2-
31
// check-fail
4-
// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
5-
// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
62

73
#![feature(linkage)]
84

Diff for: ‎tests/ui/linkage-attr/linkage3.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: invalid linkage specified
2-
--> $DIR/linkage3.rs:11:5
2+
--> $DIR/linkage3.rs:7:5
33
|
44
LL | static foo: *const i32;
55
| ^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)