Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

35 files changed, 21 insertions, 0 deletions

diff --git a/src/test/ui/repr/align-with-extern-c-fn.rs b/tests/ui/repr/align-with-extern-c-fn.rs
index 9e490e27a..9e490e27a 100644
--- a/src/test/ui/repr/align-with-extern-c-fn.rs
+++ b/tests/ui/repr/align-with-extern-c-fn.rs
diff --git a/src/test/ui/repr/aligned_enum_cast.rs b/tests/ui/repr/aligned_enum_cast.rs
index 1ddf12717..1ddf12717 100644
--- a/src/test/ui/repr/aligned_enum_cast.rs
+++ b/tests/ui/repr/aligned_enum_cast.rs
diff --git a/src/test/ui/repr/attr-usage-repr.rs b/tests/ui/repr/attr-usage-repr.rs
index 8965decc3..8965decc3 100644
--- a/src/test/ui/repr/attr-usage-repr.rs
+++ b/tests/ui/repr/attr-usage-repr.rs
diff --git a/src/test/ui/repr/attr-usage-repr.stderr b/tests/ui/repr/attr-usage-repr.stderr
index 42f65625a..42f65625a 100644
--- a/src/test/ui/repr/attr-usage-repr.stderr
+++ b/tests/ui/repr/attr-usage-repr.stderr
diff --git a/src/test/ui/repr/auxiliary/repr-transparent-non-exhaustive.rs b/tests/ui/repr/auxiliary/repr-transparent-non-exhaustive.rs
index 4bf6b54fe..4bf6b54fe 100644
--- a/src/test/ui/repr/auxiliary/repr-transparent-non-exhaustive.rs
+++ b/tests/ui/repr/auxiliary/repr-transparent-non-exhaustive.rs
diff --git a/src/test/ui/repr/invalid_repr_list_help.rs b/tests/ui/repr/invalid_repr_list_help.rs
index c32098453..c32098453 100644
--- a/src/test/ui/repr/invalid_repr_list_help.rs
+++ b/tests/ui/repr/invalid_repr_list_help.rs
diff --git a/src/test/ui/repr/invalid_repr_list_help.stderr b/tests/ui/repr/invalid_repr_list_help.stderr
index 2acd56d9a..2acd56d9a 100644
--- a/src/test/ui/repr/invalid_repr_list_help.stderr
+++ b/tests/ui/repr/invalid_repr_list_help.stderr
diff --git a/src/test/ui/repr/issue-83505-repr-simd.rs b/tests/ui/repr/issue-83505-repr-simd.rs
index 280b771d0..280b771d0 100644
--- a/src/test/ui/repr/issue-83505-repr-simd.rs
+++ b/tests/ui/repr/issue-83505-repr-simd.rs
diff --git a/src/test/ui/repr/issue-83505-repr-simd.stderr b/tests/ui/repr/issue-83505-repr-simd.stderr
index df99baaf5..df99baaf5 100644
--- a/src/test/ui/repr/issue-83505-repr-simd.stderr
+++ b/tests/ui/repr/issue-83505-repr-simd.stderr
diff --git a/src/test/ui/repr/issue-83921-ice.rs b/tests/ui/repr/issue-83921-ice.rs
index 70583eb9b..70583eb9b 100644
--- a/src/test/ui/repr/issue-83921-ice.rs
+++ b/tests/ui/repr/issue-83921-ice.rs
diff --git a/src/test/ui/repr/issue-83921-ice.stderr b/tests/ui/repr/issue-83921-ice.stderr
index 32c450410..32c450410 100644
--- a/src/test/ui/repr/issue-83921-ice.stderr
+++ b/tests/ui/repr/issue-83921-ice.stderr
diff --git a/src/test/ui/repr/repr-align-assign.fixed b/tests/ui/repr/repr-align-assign.fixed
index 59ca22e97..59ca22e97 100644
--- a/src/test/ui/repr/repr-align-assign.fixed
+++ b/tests/ui/repr/repr-align-assign.fixed
diff --git a/src/test/ui/repr/repr-align-assign.rs b/tests/ui/repr/repr-align-assign.rs
index 6b7799297..6b7799297 100644
--- a/src/test/ui/repr/repr-align-assign.rs
+++ b/tests/ui/repr/repr-align-assign.rs
diff --git a/src/test/ui/repr/repr-align-assign.stderr b/tests/ui/repr/repr-align-assign.stderr
index b878ae0d1..b878ae0d1 100644
--- a/src/test/ui/repr/repr-align-assign.stderr
+++ b/tests/ui/repr/repr-align-assign.stderr
diff --git a/src/test/ui/repr/repr-align.rs b/tests/ui/repr/repr-align.rs
index 58ecf9a51..58ecf9a51 100644
--- a/src/test/ui/repr/repr-align.rs
+++ b/tests/ui/repr/repr-align.rs
diff --git a/src/test/ui/repr/repr-align.stderr b/tests/ui/repr/repr-align.stderr
index 900a811bb..900a811bb 100644
--- a/src/test/ui/repr/repr-align.stderr
+++ b/tests/ui/repr/repr-align.stderr
diff --git a/src/test/ui/repr/repr-disallow-on-variant.rs b/tests/ui/repr/repr-disallow-on-variant.rs
index d9bd0b0e3..d9bd0b0e3 100644
--- a/src/test/ui/repr/repr-disallow-on-variant.rs
+++ b/tests/ui/repr/repr-disallow-on-variant.rs
diff --git a/src/test/ui/repr/repr-disallow-on-variant.stderr b/tests/ui/repr/repr-disallow-on-variant.stderr
index f7e4dcc9d..f7e4dcc9d 100644
--- a/src/test/ui/repr/repr-disallow-on-variant.stderr
+++ b/tests/ui/repr/repr-disallow-on-variant.stderr
diff --git a/src/test/ui/repr/repr-packed-contains-align.rs b/tests/ui/repr/repr-packed-contains-align.rs
index bef5c7d8c..bef5c7d8c 100644
--- a/src/test/ui/repr/repr-packed-contains-align.rs
+++ b/tests/ui/repr/repr-packed-contains-align.rs
diff --git a/src/test/ui/repr/repr-packed-contains-align.stderr b/tests/ui/repr/repr-packed-contains-align.stderr
index 4c3a960ca..4c3a960ca 100644
--- a/src/test/ui/repr/repr-packed-contains-align.stderr
+++ b/tests/ui/repr/repr-packed-contains-align.stderr
diff --git a/src/test/ui/repr/repr-transparent-issue-87496.rs b/tests/ui/repr/repr-transparent-issue-87496.rs
index a4dd45c63..a4dd45c63 100644
--- a/src/test/ui/repr/repr-transparent-issue-87496.rs
+++ b/tests/ui/repr/repr-transparent-issue-87496.rs
diff --git a/src/test/ui/repr/repr-transparent-issue-87496.stderr b/tests/ui/repr/repr-transparent-issue-87496.stderr
index aee31212b..aee31212b 100644
--- a/src/test/ui/repr/repr-transparent-issue-87496.stderr
+++ b/tests/ui/repr/repr-transparent-issue-87496.stderr
diff --git a/src/test/ui/repr/repr-transparent-non-exhaustive.rs b/tests/ui/repr/repr-transparent-non-exhaustive.rs
index 506f1dcf3..506f1dcf3 100644
--- a/src/test/ui/repr/repr-transparent-non-exhaustive.rs
+++ b/tests/ui/repr/repr-transparent-non-exhaustive.rs
diff --git a/src/test/ui/repr/repr-transparent-non-exhaustive.stderr b/tests/ui/repr/repr-transparent-non-exhaustive.stderr
index 16edf59c7..16edf59c7 100644
--- a/src/test/ui/repr/repr-transparent-non-exhaustive.stderr
+++ b/tests/ui/repr/repr-transparent-non-exhaustive.stderr
diff --git a/src/test/ui/repr/repr-transparent-other-items.rs b/tests/ui/repr/repr-transparent-other-items.rs
index e537e3e1a..e537e3e1a 100644
--- a/src/test/ui/repr/repr-transparent-other-items.rs
+++ b/tests/ui/repr/repr-transparent-other-items.rs
diff --git a/src/test/ui/repr/repr-transparent-other-items.stderr b/tests/ui/repr/repr-transparent-other-items.stderr
index 14e6f13e1..14e6f13e1 100644
--- a/src/test/ui/repr/repr-transparent-other-items.stderr
+++ b/tests/ui/repr/repr-transparent-other-items.stderr
diff --git a/src/test/ui/repr/repr-transparent-other-reprs.rs b/tests/ui/repr/repr-transparent-other-reprs.rs
index 0cd0edf32..0cd0edf32 100644
--- a/src/test/ui/repr/repr-transparent-other-reprs.rs
+++ b/tests/ui/repr/repr-transparent-other-reprs.rs
diff --git a/src/test/ui/repr/repr-transparent-other-reprs.stderr b/tests/ui/repr/repr-transparent-other-reprs.stderr
index d92c35811..d92c35811 100644
--- a/src/test/ui/repr/repr-transparent-other-reprs.stderr
+++ b/tests/ui/repr/repr-transparent-other-reprs.stderr
diff --git a/src/test/ui/repr/repr-transparent.rs b/tests/ui/repr/repr-transparent.rs
index 8c9d1639c..8c9d1639c 100644
--- a/src/test/ui/repr/repr-transparent.rs
+++ b/tests/ui/repr/repr-transparent.rs
diff --git a/src/test/ui/repr/repr-transparent.stderr b/tests/ui/repr/repr-transparent.stderr
index f1c570b95..f1c570b95 100644
--- a/src/test/ui/repr/repr-transparent.stderr
+++ b/tests/ui/repr/repr-transparent.stderr
diff --git a/src/test/ui/repr/repr.rs b/tests/ui/repr/repr.rs
index 564d67326..564d67326 100644
--- a/src/test/ui/repr/repr.rs
+++ b/tests/ui/repr/repr.rs
diff --git a/src/test/ui/repr/repr.stderr b/tests/ui/repr/repr.stderr
index e0bec6663..e0bec6663 100644
--- a/src/test/ui/repr/repr.stderr
+++ b/tests/ui/repr/repr.stderr
diff --git a/src/test/ui/repr/repr_c_int_align.rs b/tests/ui/repr/repr_c_int_align.rs
index fdd14fc2d..fdd14fc2d 100644
--- a/src/test/ui/repr/repr_c_int_align.rs
+++ b/tests/ui/repr/repr_c_int_align.rs
diff --git a/tests/ui/repr/transparent-enum-too-many-variants.rs b/tests/ui/repr/transparent-enum-too-many-variants.rs
new file mode 100644
index 000000000..0dd4b4e68
--- /dev/null
+++ b/tests/ui/repr/transparent-enum-too-many-variants.rs
@@ -0,0 +1,10 @@
+use std::mem::size_of;
+
+#[repr(transparent)]
+enum Foo { //~ ERROR E0731
+    A(u8), B(u8),
+}
+
+fn main() {
+    println!("Foo: {}", size_of::<Foo>());
+}
diff --git a/tests/ui/repr/transparent-enum-too-many-variants.stderr b/tests/ui/repr/transparent-enum-too-many-variants.stderr
new file mode 100644
index 000000000..fb44757ef
--- /dev/null
+++ b/tests/ui/repr/transparent-enum-too-many-variants.stderr
@@ -0,0 +1,11 @@
+error[E0731]: transparent enum needs exactly one variant, but has 2
+  --> $DIR/transparent-enum-too-many-variants.rs:4:1
+   |
+LL | enum Foo {
+   | ^^^^^^^^ needs exactly one variant, but has 2
+LL |     A(u8), B(u8),
+   |     -      - too many variants in `Foo`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0731`.