Merging upstream version 1.68.2+dfsg1.

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

22 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-a.rs b/tests/ui/imports/issue-45829/auxiliary/issue-45829-a.rs
index e9f7fefb6..e9f7fefb6 100644
--- a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-a.rs
+++ b/tests/ui/imports/issue-45829/auxiliary/issue-45829-a.rs
diff --git a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-b.rs b/tests/ui/imports/issue-45829/auxiliary/issue-45829-b.rs
index e9f7fefb6..e9f7fefb6 100644
--- a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-b.rs
+++ b/tests/ui/imports/issue-45829/auxiliary/issue-45829-b.rs
diff --git a/src/test/ui/imports/issue-45829/import-self.rs b/tests/ui/imports/issue-45829/import-self.rs
index 2dc4331ce..2dc4331ce 100644
--- a/src/test/ui/imports/issue-45829/import-self.rs
+++ b/tests/ui/imports/issue-45829/import-self.rs
diff --git a/src/test/ui/imports/issue-45829/import-self.stderr b/tests/ui/imports/issue-45829/import-self.stderr
index 0c9424f30..0c9424f30 100644
--- a/src/test/ui/imports/issue-45829/import-self.stderr
+++ b/tests/ui/imports/issue-45829/import-self.stderr
diff --git a/src/test/ui/imports/issue-45829/import-twice.rs b/tests/ui/imports/issue-45829/import-twice.rs
index e5a8bb7ad..e5a8bb7ad 100644
--- a/src/test/ui/imports/issue-45829/import-twice.rs
+++ b/tests/ui/imports/issue-45829/import-twice.rs
diff --git a/src/test/ui/imports/issue-45829/import-twice.stderr b/tests/ui/imports/issue-45829/import-twice.stderr
index 656b011bc..656b011bc 100644
--- a/src/test/ui/imports/issue-45829/import-twice.stderr
+++ b/tests/ui/imports/issue-45829/import-twice.stderr
diff --git a/src/test/ui/imports/issue-45829/issue-45829.rs b/tests/ui/imports/issue-45829/issue-45829.rs
index 1e76e4b14..1e76e4b14 100644
--- a/src/test/ui/imports/issue-45829/issue-45829.rs
+++ b/tests/ui/imports/issue-45829/issue-45829.rs
diff --git a/src/test/ui/imports/issue-45829/issue-45829.stderr b/tests/ui/imports/issue-45829/issue-45829.stderr
index e9a9d47ce..e9a9d47ce 100644
--- a/src/test/ui/imports/issue-45829/issue-45829.stderr
+++ b/tests/ui/imports/issue-45829/issue-45829.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-extern-vs-use.rs b/tests/ui/imports/issue-45829/rename-extern-vs-use.rs
index aef7aa35c..aef7aa35c 100644
--- a/src/test/ui/imports/issue-45829/rename-extern-vs-use.rs
+++ b/tests/ui/imports/issue-45829/rename-extern-vs-use.rs
diff --git a/src/test/ui/imports/issue-45829/rename-extern-vs-use.stderr b/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr
index 98fd8a623..98fd8a623 100644
--- a/src/test/ui/imports/issue-45829/rename-extern-vs-use.stderr
+++ b/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-extern-with-tab.rs b/tests/ui/imports/issue-45829/rename-extern-with-tab.rs
index 0da8b826c..0da8b826c 100644
--- a/src/test/ui/imports/issue-45829/rename-extern-with-tab.rs
+++ b/tests/ui/imports/issue-45829/rename-extern-with-tab.rs
diff --git a/src/test/ui/imports/issue-45829/rename-extern-with-tab.stderr b/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr
index 2c4e8ce99..2c4e8ce99 100644
--- a/src/test/ui/imports/issue-45829/rename-extern-with-tab.stderr
+++ b/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-extern.rs b/tests/ui/imports/issue-45829/rename-extern.rs
index 7dbda6932..7dbda6932 100644
--- a/src/test/ui/imports/issue-45829/rename-extern.rs
+++ b/tests/ui/imports/issue-45829/rename-extern.rs
diff --git a/src/test/ui/imports/issue-45829/rename-extern.stderr b/tests/ui/imports/issue-45829/rename-extern.stderr
index 209ae2201..209ae2201 100644
--- a/src/test/ui/imports/issue-45829/rename-extern.stderr
+++ b/tests/ui/imports/issue-45829/rename-extern.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-use-vs-extern.rs b/tests/ui/imports/issue-45829/rename-use-vs-extern.rs
index 0cf3a77fd..0cf3a77fd 100644
--- a/src/test/ui/imports/issue-45829/rename-use-vs-extern.rs
+++ b/tests/ui/imports/issue-45829/rename-use-vs-extern.rs
diff --git a/src/test/ui/imports/issue-45829/rename-use-vs-extern.stderr b/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr
index dfb5810c4..dfb5810c4 100644
--- a/src/test/ui/imports/issue-45829/rename-use-vs-extern.stderr
+++ b/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-use-with-tabs.rs b/tests/ui/imports/issue-45829/rename-use-with-tabs.rs
index 86c5fa00f..86c5fa00f 100644
--- a/src/test/ui/imports/issue-45829/rename-use-with-tabs.rs
+++ b/tests/ui/imports/issue-45829/rename-use-with-tabs.rs
diff --git a/src/test/ui/imports/issue-45829/rename-use-with-tabs.stderr b/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr
index 5a63af588..5a63af588 100644
--- a/src/test/ui/imports/issue-45829/rename-use-with-tabs.stderr
+++ b/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr
diff --git a/src/test/ui/imports/issue-45829/rename-with-path.rs b/tests/ui/imports/issue-45829/rename-with-path.rs
index e278a8789..e278a8789 100644
--- a/src/test/ui/imports/issue-45829/rename-with-path.rs
+++ b/tests/ui/imports/issue-45829/rename-with-path.rs
diff --git a/src/test/ui/imports/issue-45829/rename-with-path.stderr b/tests/ui/imports/issue-45829/rename-with-path.stderr
index 2d26b0838..2d26b0838 100644
--- a/src/test/ui/imports/issue-45829/rename-with-path.stderr
+++ b/tests/ui/imports/issue-45829/rename-with-path.stderr
diff --git a/src/test/ui/imports/issue-45829/rename.rs b/tests/ui/imports/issue-45829/rename.rs
index 1c45956c6..1c45956c6 100644
--- a/src/test/ui/imports/issue-45829/rename.rs
+++ b/tests/ui/imports/issue-45829/rename.rs
diff --git a/src/test/ui/imports/issue-45829/rename.stderr b/tests/ui/imports/issue-45829/rename.stderr
index ed185ae2a..ed185ae2a 100644
--- a/src/test/ui/imports/issue-45829/rename.stderr
+++ b/tests/ui/imports/issue-45829/rename.stderr