Merging upstream version 1.68.2+dfsg1.

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

19 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/json/json-and-color.rs b/tests/ui/json/json-and-color.rs
index 6f8326fe2..6f8326fe2 100644
--- a/src/test/ui/json/json-and-color.rs
+++ b/tests/ui/json/json-and-color.rs
diff --git a/src/test/ui/json/json-and-color.stderr b/tests/ui/json/json-and-color.stderr
index 1cda6af09..1cda6af09 100644
--- a/src/test/ui/json/json-and-color.stderr
+++ b/tests/ui/json/json-and-color.stderr
diff --git a/src/test/ui/json/json-and-error-format.rs b/tests/ui/json/json-and-error-format.rs
index 6e2d73c76..6e2d73c76 100644
--- a/src/test/ui/json/json-and-error-format.rs
+++ b/tests/ui/json/json-and-error-format.rs
diff --git a/src/test/ui/json/json-and-error-format.stderr b/tests/ui/json/json-and-error-format.stderr
index 80e022137..80e022137 100644
--- a/src/test/ui/json/json-and-error-format.stderr
+++ b/tests/ui/json/json-and-error-format.stderr
diff --git a/src/test/ui/json/json-bom-plus-crlf-multifile-aux.rs b/tests/ui/json/json-bom-plus-crlf-multifile-aux.rs
index 991ea1d85..991ea1d85 100644
--- a/src/test/ui/json/json-bom-plus-crlf-multifile-aux.rs
+++ b/tests/ui/json/json-bom-plus-crlf-multifile-aux.rs
diff --git a/src/test/ui/json/json-bom-plus-crlf-multifile.rs b/tests/ui/json/json-bom-plus-crlf-multifile.rs
index 9290e0104..9290e0104 100644
--- a/src/test/ui/json/json-bom-plus-crlf-multifile.rs
+++ b/tests/ui/json/json-bom-plus-crlf-multifile.rs
diff --git a/src/test/ui/json/json-bom-plus-crlf-multifile.stderr b/tests/ui/json/json-bom-plus-crlf-multifile.stderr
index 02f3bc687..02f3bc687 100644
--- a/src/test/ui/json/json-bom-plus-crlf-multifile.stderr
+++ b/tests/ui/json/json-bom-plus-crlf-multifile.stderr
diff --git a/src/test/ui/json/json-bom-plus-crlf.rs b/tests/ui/json/json-bom-plus-crlf.rs
index be5b7dd2a..be5b7dd2a 100644
--- a/src/test/ui/json/json-bom-plus-crlf.rs
+++ b/tests/ui/json/json-bom-plus-crlf.rs
diff --git a/src/test/ui/json/json-bom-plus-crlf.stderr b/tests/ui/json/json-bom-plus-crlf.stderr
index df6bd7286..df6bd7286 100644
--- a/src/test/ui/json/json-bom-plus-crlf.stderr
+++ b/tests/ui/json/json-bom-plus-crlf.stderr
diff --git a/src/test/ui/json/json-invalid.rs b/tests/ui/json/json-invalid.rs
index 54d0dd184..54d0dd184 100644
--- a/src/test/ui/json/json-invalid.rs
+++ b/tests/ui/json/json-invalid.rs
diff --git a/src/test/ui/json/json-invalid.stderr b/tests/ui/json/json-invalid.stderr
index 18bc76ab7..18bc76ab7 100644
--- a/src/test/ui/json/json-invalid.stderr
+++ b/tests/ui/json/json-invalid.stderr
diff --git a/src/test/ui/json/json-multiple.polonius.stderr b/tests/ui/json/json-multiple.polonius.stderr
index 0e4d442f2..0e4d442f2 100644
--- a/src/test/ui/json/json-multiple.polonius.stderr
+++ b/tests/ui/json/json-multiple.polonius.stderr
diff --git a/src/test/ui/json/json-multiple.rs b/tests/ui/json/json-multiple.rs
index fb126339d..fb126339d 100644
--- a/src/test/ui/json/json-multiple.rs
+++ b/tests/ui/json/json-multiple.rs
diff --git a/src/test/ui/json/json-multiple.stderr b/tests/ui/json/json-multiple.stderr
index 55ccfd5fa..55ccfd5fa 100644
--- a/src/test/ui/json/json-multiple.stderr
+++ b/tests/ui/json/json-multiple.stderr
diff --git a/src/test/ui/json/json-options.polonius.stderr b/tests/ui/json/json-options.polonius.stderr
index e21f6f85d..e21f6f85d 100644
--- a/src/test/ui/json/json-options.polonius.stderr
+++ b/tests/ui/json/json-options.polonius.stderr
diff --git a/src/test/ui/json/json-options.rs b/tests/ui/json/json-options.rs
index 8b6ba131e..8b6ba131e 100644
--- a/src/test/ui/json/json-options.rs
+++ b/tests/ui/json/json-options.rs
diff --git a/src/test/ui/json/json-options.stderr b/tests/ui/json/json-options.stderr
index 645a26f5a..645a26f5a 100644
--- a/src/test/ui/json/json-options.stderr
+++ b/tests/ui/json/json-options.stderr
diff --git a/src/test/ui/json/json-short.rs b/tests/ui/json/json-short.rs
index 7414a5586..7414a5586 100644
--- a/src/test/ui/json/json-short.rs
+++ b/tests/ui/json/json-short.rs
diff --git a/src/test/ui/json/json-short.stderr b/tests/ui/json/json-short.stderr
index 3bd85b083..3bd85b083 100644
--- a/src/test/ui/json/json-short.stderr
+++ b/tests/ui/json/json-short.stderr