Rollup merge of #57107 - mjbshaw:thread_local_test, r=nikomatsakis

[rust.git] / src / test / ui / conflicting-repr-hints.stderr

diff --git a/src/test/ui/conflicting-repr-hints.stderr b/src/test/ui/conflicting-repr-hints.stderr
index 01b72d93823cc555002764145ef060c129227881..148f1211b08343d1f30a480dd9c8b747c796100d 100644 (file)
--- a/src/test/ui/conflicting-repr-hints.stderr
+++ b/src/test/ui/conflicting-repr-hints.stderr
@@ -1,47 +1,47 @@
 warning[E0566]: conflicting representation hints
-  --> $DIR/conflicting-repr-hints.rs:19:8
+  --> $DIR/conflicting-repr-hints.rs:9:8
    |
 LL | #[repr(C, u64)] //~ WARNING conflicting representation hints
    |        ^  ^^^
 
 warning[E0566]: conflicting representation hints
-  --> $DIR/conflicting-repr-hints.rs:22:8
+  --> $DIR/conflicting-repr-hints.rs:12:8
    |
 LL | #[repr(u32, u64)] //~ WARNING conflicting representation hints
    |        ^^^  ^^^
 
 error[E0587]: type has conflicting packed and align representation hints
-  --> $DIR/conflicting-repr-hints.rs:29:1
+  --> $DIR/conflicting-repr-hints.rs:19:1
    |
 LL | struct F(i32); //~ ERROR type has conflicting packed and align representation hints
    | ^^^^^^^^^^^^^^
 
 error[E0587]: type has conflicting packed and align representation hints
-  --> $DIR/conflicting-repr-hints.rs:33:1
+  --> $DIR/conflicting-repr-hints.rs:23:1
    |
 LL | struct G(i32); //~ ERROR type has conflicting packed and align representation hints
    | ^^^^^^^^^^^^^^
 
 error[E0587]: type has conflicting packed and align representation hints
-  --> $DIR/conflicting-repr-hints.rs:37:1
+  --> $DIR/conflicting-repr-hints.rs:27:1
    |
 LL | struct H(i32); //~ ERROR type has conflicting packed and align representation hints
    | ^^^^^^^^^^^^^^
 
 error[E0634]: type has conflicting packed representation hints
-  --> $DIR/conflicting-repr-hints.rs:40:1
+  --> $DIR/conflicting-repr-hints.rs:30:1
    |
 LL | struct I(i32); //~ ERROR type has conflicting packed representation hints
    | ^^^^^^^^^^^^^^
 
 error[E0634]: type has conflicting packed representation hints
-  --> $DIR/conflicting-repr-hints.rs:44:1
+  --> $DIR/conflicting-repr-hints.rs:34:1
    |
 LL | struct J(i32); //~ ERROR type has conflicting packed representation hints
    | ^^^^^^^^^^^^^^
 
 error[E0587]: type has conflicting packed and align representation hints
-  --> $DIR/conflicting-repr-hints.rs:50:1
+  --> $DIR/conflicting-repr-hints.rs:40:1
    |
 LL | / union X { //~ ERROR type has conflicting packed and align representation hints
 LL | |     i: i32
@@ -49,7 +49,7 @@ LL | | }
    | |_^
 
 error[E0587]: type has conflicting packed and align representation hints
-  --> $DIR/conflicting-repr-hints.rs:56:1
+  --> $DIR/conflicting-repr-hints.rs:46:1
    |
 LL | / union Y { //~ ERROR type has conflicting packed and align representation hints
 LL | |     i: i32
@@ -57,7 +57,7 @@ LL | | }
    | |_^
 
 error[E0587]: type has conflicting packed and align representation hints
-  --> $DIR/conflicting-repr-hints.rs:62:1
+  --> $DIR/conflicting-repr-hints.rs:52:1
    |
 LL | / union Z { //~ ERROR type has conflicting packed and align representation hints
 LL | |     i: i32