Merging upstream version 1.68.2+dfsg1.

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

36 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.rs b/tests/ui/pub/issue-33174-restricted-type-in-public-interface.rs
index 67f888c5e..67f888c5e 100644
--- a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.rs
+++ b/tests/ui/pub/issue-33174-restricted-type-in-public-interface.rs
diff --git a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.stderr b/tests/ui/pub/issue-33174-restricted-type-in-public-interface.stderr
index 39d4f5ac8..39d4f5ac8 100644
--- a/src/test/ui/pub/issue-33174-restricted-type-in-public-interface.stderr
+++ b/tests/ui/pub/issue-33174-restricted-type-in-public-interface.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-2.fixed b/tests/ui/pub/pub-ident-fn-2.fixed
index afd75a41f..afd75a41f 100644
--- a/src/test/ui/pub/pub-ident-fn-2.fixed
+++ b/tests/ui/pub/pub-ident-fn-2.fixed
diff --git a/src/test/ui/pub/pub-ident-fn-2.rs b/tests/ui/pub/pub-ident-fn-2.rs
index e7b86a909..e7b86a909 100644
--- a/src/test/ui/pub/pub-ident-fn-2.rs
+++ b/tests/ui/pub/pub-ident-fn-2.rs
diff --git a/src/test/ui/pub/pub-ident-fn-2.stderr b/tests/ui/pub/pub-ident-fn-2.stderr
index b5b667b41..b5b667b41 100644
--- a/src/test/ui/pub/pub-ident-fn-2.stderr
+++ b/tests/ui/pub/pub-ident-fn-2.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-3.rs b/tests/ui/pub/pub-ident-fn-3.rs
index fdbea7cf4..fdbea7cf4 100644
--- a/src/test/ui/pub/pub-ident-fn-3.rs
+++ b/tests/ui/pub/pub-ident-fn-3.rs
diff --git a/src/test/ui/pub/pub-ident-fn-3.stderr b/tests/ui/pub/pub-ident-fn-3.stderr
index 6d3d4e592..6d3d4e592 100644
--- a/src/test/ui/pub/pub-ident-fn-3.stderr
+++ b/tests/ui/pub/pub-ident-fn-3.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-or-struct-2.rs b/tests/ui/pub/pub-ident-fn-or-struct-2.rs
index 8f67cdd29..8f67cdd29 100644
--- a/src/test/ui/pub/pub-ident-fn-or-struct-2.rs
+++ b/tests/ui/pub/pub-ident-fn-or-struct-2.rs
diff --git a/src/test/ui/pub/pub-ident-fn-or-struct-2.stderr b/tests/ui/pub/pub-ident-fn-or-struct-2.stderr
index 047e66b18..047e66b18 100644
--- a/src/test/ui/pub/pub-ident-fn-or-struct-2.stderr
+++ b/tests/ui/pub/pub-ident-fn-or-struct-2.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-or-struct.rs b/tests/ui/pub/pub-ident-fn-or-struct.rs
index 832831d29..832831d29 100644
--- a/src/test/ui/pub/pub-ident-fn-or-struct.rs
+++ b/tests/ui/pub/pub-ident-fn-or-struct.rs
diff --git a/src/test/ui/pub/pub-ident-fn-or-struct.stderr b/tests/ui/pub/pub-ident-fn-or-struct.stderr
index c4a196eb2..c4a196eb2 100644
--- a/src/test/ui/pub/pub-ident-fn-or-struct.stderr
+++ b/tests/ui/pub/pub-ident-fn-or-struct.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime-2.rs b/tests/ui/pub/pub-ident-fn-with-lifetime-2.rs
index 1ee8c84f1..1ee8c84f1 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime-2.rs
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime-2.rs
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime-2.stderr b/tests/ui/pub/pub-ident-fn-with-lifetime-2.stderr
index 6a9aeaf4a..6a9aeaf4a 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime-2.stderr
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime-2.stderr
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime.fixed b/tests/ui/pub/pub-ident-fn-with-lifetime.fixed
index e510ace5f..e510ace5f 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime.fixed
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime.fixed
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime.rs b/tests/ui/pub/pub-ident-fn-with-lifetime.rs
index 63e6eca15..63e6eca15 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime.rs
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime.rs
diff --git a/src/test/ui/pub/pub-ident-fn-with-lifetime.stderr b/tests/ui/pub/pub-ident-fn-with-lifetime.stderr
index c1ca0136b..c1ca0136b 100644
--- a/src/test/ui/pub/pub-ident-fn-with-lifetime.stderr
+++ b/tests/ui/pub/pub-ident-fn-with-lifetime.stderr
diff --git a/src/test/ui/pub/pub-ident-fn.fixed b/tests/ui/pub/pub-ident-fn.fixed
index 65ed8c7b4..65ed8c7b4 100644
--- a/src/test/ui/pub/pub-ident-fn.fixed
+++ b/tests/ui/pub/pub-ident-fn.fixed
diff --git a/src/test/ui/pub/pub-ident-fn.rs b/tests/ui/pub/pub-ident-fn.rs
index 2fe4d34fb..2fe4d34fb 100644
--- a/src/test/ui/pub/pub-ident-fn.rs
+++ b/tests/ui/pub/pub-ident-fn.rs
diff --git a/src/test/ui/pub/pub-ident-fn.stderr b/tests/ui/pub/pub-ident-fn.stderr
index cb94c48ad..cb94c48ad 100644
--- a/src/test/ui/pub/pub-ident-fn.stderr
+++ b/tests/ui/pub/pub-ident-fn.stderr
diff --git a/src/test/ui/pub/pub-ident-struct-with-lifetime.rs b/tests/ui/pub/pub-ident-struct-with-lifetime.rs
index 2feb02660..2feb02660 100644
--- a/src/test/ui/pub/pub-ident-struct-with-lifetime.rs
+++ b/tests/ui/pub/pub-ident-struct-with-lifetime.rs
diff --git a/src/test/ui/pub/pub-ident-struct-with-lifetime.stderr b/tests/ui/pub/pub-ident-struct-with-lifetime.stderr
index 562b68e35..562b68e35 100644
--- a/src/test/ui/pub/pub-ident-struct-with-lifetime.stderr
+++ b/tests/ui/pub/pub-ident-struct-with-lifetime.stderr
diff --git a/src/test/ui/pub/pub-ident-struct.fixed b/tests/ui/pub/pub-ident-struct.fixed
index 58cde8fd6..58cde8fd6 100644
--- a/src/test/ui/pub/pub-ident-struct.fixed
+++ b/tests/ui/pub/pub-ident-struct.fixed
diff --git a/src/test/ui/pub/pub-ident-struct.rs b/tests/ui/pub/pub-ident-struct.rs
index 3930e556e..3930e556e 100644
--- a/src/test/ui/pub/pub-ident-struct.rs
+++ b/tests/ui/pub/pub-ident-struct.rs
diff --git a/src/test/ui/pub/pub-ident-struct.stderr b/tests/ui/pub/pub-ident-struct.stderr
index d3a378786..d3a378786 100644
--- a/src/test/ui/pub/pub-ident-struct.stderr
+++ b/tests/ui/pub/pub-ident-struct.stderr
diff --git a/src/test/ui/pub/pub-ident-with-lifetime-incomplete.rs b/tests/ui/pub/pub-ident-with-lifetime-incomplete.rs
index c86a9f2fd..c86a9f2fd 100644
--- a/src/test/ui/pub/pub-ident-with-lifetime-incomplete.rs
+++ b/tests/ui/pub/pub-ident-with-lifetime-incomplete.rs
diff --git a/src/test/ui/pub/pub-ident-with-lifetime-incomplete.stderr b/tests/ui/pub/pub-ident-with-lifetime-incomplete.stderr
index 0e0b12705..0e0b12705 100644
--- a/src/test/ui/pub/pub-ident-with-lifetime-incomplete.stderr
+++ b/tests/ui/pub/pub-ident-with-lifetime-incomplete.stderr
diff --git a/src/test/ui/pub/pub-reexport-priv-extern-crate.rs b/tests/ui/pub/pub-reexport-priv-extern-crate.rs
index dd5cd420f..dd5cd420f 100644
--- a/src/test/ui/pub/pub-reexport-priv-extern-crate.rs
+++ b/tests/ui/pub/pub-reexport-priv-extern-crate.rs
diff --git a/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr b/tests/ui/pub/pub-reexport-priv-extern-crate.stderr
index c7fadc6f9..c7fadc6f9 100644
--- a/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr
+++ b/tests/ui/pub/pub-reexport-priv-extern-crate.stderr
diff --git a/src/test/ui/pub/pub-restricted-error-fn.rs b/tests/ui/pub/pub-restricted-error-fn.rs
index fc1aeae2b..fc1aeae2b 100644
--- a/src/test/ui/pub/pub-restricted-error-fn.rs
+++ b/tests/ui/pub/pub-restricted-error-fn.rs
diff --git a/src/test/ui/pub/pub-restricted-error-fn.stderr b/tests/ui/pub/pub-restricted-error-fn.stderr
index 0511a821a..0511a821a 100644
--- a/src/test/ui/pub/pub-restricted-error-fn.stderr
+++ b/tests/ui/pub/pub-restricted-error-fn.stderr
diff --git a/src/test/ui/pub/pub-restricted-error.rs b/tests/ui/pub/pub-restricted-error.rs
index 60fce3f51..60fce3f51 100644
--- a/src/test/ui/pub/pub-restricted-error.rs
+++ b/tests/ui/pub/pub-restricted-error.rs
diff --git a/src/test/ui/pub/pub-restricted-error.stderr b/tests/ui/pub/pub-restricted-error.stderr
index b47328f34..b47328f34 100644
--- a/src/test/ui/pub/pub-restricted-error.stderr
+++ b/tests/ui/pub/pub-restricted-error.stderr
diff --git a/src/test/ui/pub/pub-restricted-non-path.rs b/tests/ui/pub/pub-restricted-non-path.rs
index bdad18dbe..bdad18dbe 100644
--- a/src/test/ui/pub/pub-restricted-non-path.rs
+++ b/tests/ui/pub/pub-restricted-non-path.rs
diff --git a/src/test/ui/pub/pub-restricted-non-path.stderr b/tests/ui/pub/pub-restricted-non-path.stderr
index e0ea50621..e0ea50621 100644
--- a/src/test/ui/pub/pub-restricted-non-path.stderr
+++ b/tests/ui/pub/pub-restricted-non-path.stderr
diff --git a/src/test/ui/pub/pub-restricted.rs b/tests/ui/pub/pub-restricted.rs
index bcd21082f..bcd21082f 100644
--- a/src/test/ui/pub/pub-restricted.rs
+++ b/tests/ui/pub/pub-restricted.rs
diff --git a/src/test/ui/pub/pub-restricted.stderr b/tests/ui/pub/pub-restricted.stderr
index 4694530e5..4694530e5 100644
--- a/src/test/ui/pub/pub-restricted.stderr
+++ b/tests/ui/pub/pub-restricted.stderr