Merging upstream version 1.68.2+dfsg1.

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

26 files changed, 11 insertions, 0 deletions

diff --git a/src/test/ui/layout/big-type-no-err.rs b/tests/ui/layout/big-type-no-err.rs
index af8191a9c..af8191a9c 100644
--- a/src/test/ui/layout/big-type-no-err.rs
+++ b/tests/ui/layout/big-type-no-err.rs
diff --git a/src/test/ui/layout/debug.rs b/tests/ui/layout/debug.rs
index a282e7123..a282e7123 100644
--- a/src/test/ui/layout/debug.rs
+++ b/tests/ui/layout/debug.rs
diff --git a/src/test/ui/layout/debug.stderr b/tests/ui/layout/debug.stderr
index c5e1c41d1..c5e1c41d1 100644
--- a/src/test/ui/layout/debug.stderr
+++ b/tests/ui/layout/debug.stderr
diff --git a/src/test/ui/layout/hexagon-enum.rs b/tests/ui/layout/hexagon-enum.rs
index 4c58537e3..4c58537e3 100644
--- a/src/test/ui/layout/hexagon-enum.rs
+++ b/tests/ui/layout/hexagon-enum.rs
diff --git a/src/test/ui/layout/hexagon-enum.stderr b/tests/ui/layout/hexagon-enum.stderr
index d850dd69c..d850dd69c 100644
--- a/src/test/ui/layout/hexagon-enum.stderr
+++ b/tests/ui/layout/hexagon-enum.stderr
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs b/tests/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs
index 7eecd99dc..7eecd99dc 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs
+++ b/tests/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr b/tests/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
index e19216a99..e19216a99 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
+++ b/tests/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs b/tests/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
index a473c5c97..a473c5c97 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
+++ b/tests/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr b/tests/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
index 17d639da0..17d639da0 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
+++ b/tests/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
diff --git a/src/test/ui/layout/issue-60431-unsized-tail-behind-projection.rs b/tests/ui/layout/issue-60431-unsized-tail-behind-projection.rs
index 65845d2c9..65845d2c9 100644
--- a/src/test/ui/layout/issue-60431-unsized-tail-behind-projection.rs
+++ b/tests/ui/layout/issue-60431-unsized-tail-behind-projection.rs
diff --git a/src/test/ui/layout/issue-84108.rs b/tests/ui/layout/issue-84108.rs
index dd025c9b4..dd025c9b4 100644
--- a/src/test/ui/layout/issue-84108.rs
+++ b/tests/ui/layout/issue-84108.rs
diff --git a/src/test/ui/layout/issue-84108.stderr b/tests/ui/layout/issue-84108.stderr
index 36be64241..36be64241 100644
--- a/src/test/ui/layout/issue-84108.stderr
+++ b/tests/ui/layout/issue-84108.stderr
diff --git a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs b/tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs
index af5f5885d..af5f5885d 100644
--- a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs
+++ b/tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.rs
diff --git a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr b/tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
index 20d4c418e..20d4c418e 100644
--- a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
+++ b/tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
diff --git a/src/test/ui/layout/issue-96185-overaligned-enum.rs b/tests/ui/layout/issue-96185-overaligned-enum.rs
index ae1e6b012..ae1e6b012 100644
--- a/src/test/ui/layout/issue-96185-overaligned-enum.rs
+++ b/tests/ui/layout/issue-96185-overaligned-enum.rs
diff --git a/src/test/ui/layout/issue-96185-overaligned-enum.stderr b/tests/ui/layout/issue-96185-overaligned-enum.stderr
index de6177c8d..de6177c8d 100644
--- a/src/test/ui/layout/issue-96185-overaligned-enum.stderr
+++ b/tests/ui/layout/issue-96185-overaligned-enum.stderr
diff --git a/tests/ui/layout/thin-meta-implies-thin-ptr.rs b/tests/ui/layout/thin-meta-implies-thin-ptr.rs
new file mode 100644
index 000000000..972579ea8
--- /dev/null
+++ b/tests/ui/layout/thin-meta-implies-thin-ptr.rs
@@ -0,0 +1,11 @@
+// check-pass
+
+#![feature(ptr_metadata)]
+
+use std::ptr::Thin;
+
+fn main() {}
+
+fn foo<T: ?Sized + Thin>(t: *const T) -> *const () {
+    unsafe { std::mem::transmute(t) }
+}
diff --git a/src/test/ui/layout/thumb-enum.rs b/tests/ui/layout/thumb-enum.rs
index 3b43b1b83..3b43b1b83 100644
--- a/src/test/ui/layout/thumb-enum.rs
+++ b/tests/ui/layout/thumb-enum.rs
diff --git a/src/test/ui/layout/thumb-enum.stderr b/tests/ui/layout/thumb-enum.stderr
index 227bd950b..227bd950b 100644
--- a/src/test/ui/layout/thumb-enum.stderr
+++ b/tests/ui/layout/thumb-enum.stderr
diff --git a/src/test/ui/layout/unsafe-cell-hides-niche.rs b/tests/ui/layout/unsafe-cell-hides-niche.rs
index 68bcc3c1a..68bcc3c1a 100644
--- a/src/test/ui/layout/unsafe-cell-hides-niche.rs
+++ b/tests/ui/layout/unsafe-cell-hides-niche.rs
diff --git a/src/test/ui/layout/valid_range_oob.rs b/tests/ui/layout/valid_range_oob.rs
index 74aa47fe4..74aa47fe4 100644
--- a/src/test/ui/layout/valid_range_oob.rs
+++ b/tests/ui/layout/valid_range_oob.rs
diff --git a/src/test/ui/layout/valid_range_oob.stderr b/tests/ui/layout/valid_range_oob.stderr
index 7398f0164..7398f0164 100644
--- a/src/test/ui/layout/valid_range_oob.stderr
+++ b/tests/ui/layout/valid_range_oob.stderr
diff --git a/src/test/ui/layout/zero-sized-array-enum-niche.rs b/tests/ui/layout/zero-sized-array-enum-niche.rs
index 23bbbfbfc..23bbbfbfc 100644
--- a/src/test/ui/layout/zero-sized-array-enum-niche.rs
+++ b/tests/ui/layout/zero-sized-array-enum-niche.rs
diff --git a/src/test/ui/layout/zero-sized-array-enum-niche.stderr b/tests/ui/layout/zero-sized-array-enum-niche.stderr
index a3e82070e..a3e82070e 100644
--- a/src/test/ui/layout/zero-sized-array-enum-niche.stderr
+++ b/tests/ui/layout/zero-sized-array-enum-niche.stderr
diff --git a/src/test/ui/layout/zero-sized-array-union.rs b/tests/ui/layout/zero-sized-array-union.rs
index 1a662ba44..1a662ba44 100644
--- a/src/test/ui/layout/zero-sized-array-union.rs
+++ b/tests/ui/layout/zero-sized-array-union.rs
diff --git a/src/test/ui/layout/zero-sized-array-union.stderr b/tests/ui/layout/zero-sized-array-union.stderr
index de2b863e4..de2b863e4 100644
--- a/src/test/ui/layout/zero-sized-array-union.stderr
+++ b/tests/ui/layout/zero-sized-array-union.stderr