Merging upstream version 1.68.2+dfsg1.

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

23 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/linkage-attr/auxiliary/def_colliding_external.rs b/tests/ui/linkage-attr/auxiliary/def_colliding_external.rs
index 60b55b3e2..60b55b3e2 100644
--- a/src/test/ui/linkage-attr/auxiliary/def_colliding_external.rs
+++ b/tests/ui/linkage-attr/auxiliary/def_colliding_external.rs
diff --git a/src/test/ui/linkage-attr/auxiliary/def_external.rs b/tests/ui/linkage-attr/auxiliary/def_external.rs
index 2300930e5..2300930e5 100644
--- a/src/test/ui/linkage-attr/auxiliary/def_external.rs
+++ b/tests/ui/linkage-attr/auxiliary/def_external.rs
diff --git a/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs b/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
index 0d927117d..0d927117d 100644
--- a/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
+++ b/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
diff --git a/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs b/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
index 0a296f0b2..0a296f0b2 100644
--- a/src/test/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
+++ b/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
diff --git a/src/test/ui/linkage-attr/auxiliary/linkage1.rs b/tests/ui/linkage-attr/auxiliary/linkage1.rs
index e87ce5e4d..e87ce5e4d 100644
--- a/src/test/ui/linkage-attr/auxiliary/linkage1.rs
+++ b/tests/ui/linkage-attr/auxiliary/linkage1.rs
diff --git a/src/test/ui/linkage-attr/issue-10755.rs b/tests/ui/linkage-attr/issue-10755.rs
index afd2dc46c..afd2dc46c 100644
--- a/src/test/ui/linkage-attr/issue-10755.rs
+++ b/tests/ui/linkage-attr/issue-10755.rs
diff --git a/src/test/ui/linkage-attr/link-attr-validation-early.rs b/tests/ui/linkage-attr/link-attr-validation-early.rs
index b9a835fb5..b9a835fb5 100644
--- a/src/test/ui/linkage-attr/link-attr-validation-early.rs
+++ b/tests/ui/linkage-attr/link-attr-validation-early.rs
diff --git a/src/test/ui/linkage-attr/link-attr-validation-early.stderr b/tests/ui/linkage-attr/link-attr-validation-early.stderr
index 24ad9d825..24ad9d825 100644
--- a/src/test/ui/linkage-attr/link-attr-validation-early.stderr
+++ b/tests/ui/linkage-attr/link-attr-validation-early.stderr
diff --git a/src/test/ui/linkage-attr/link-attr-validation-late.rs b/tests/ui/linkage-attr/link-attr-validation-late.rs
index 34f720dd2..34f720dd2 100644
--- a/src/test/ui/linkage-attr/link-attr-validation-late.rs
+++ b/tests/ui/linkage-attr/link-attr-validation-late.rs
diff --git a/src/test/ui/linkage-attr/link-attr-validation-late.stderr b/tests/ui/linkage-attr/link-attr-validation-late.stderr
index 1ad5fbaf7..1ad5fbaf7 100644
--- a/src/test/ui/linkage-attr/link-attr-validation-late.stderr
+++ b/tests/ui/linkage-attr/link-attr-validation-late.stderr
diff --git a/src/test/ui/linkage-attr/link-cfg-works.rs b/tests/ui/linkage-attr/link-cfg-works.rs
index 254091ff2..254091ff2 100644
--- a/src/test/ui/linkage-attr/link-cfg-works.rs
+++ b/tests/ui/linkage-attr/link-cfg-works.rs
diff --git a/src/test/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs
index 3a0910658..3a0910658 100644
--- a/src/test/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs
+++ b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs
diff --git a/src/test/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr
index 06a070822..06a070822 100644
--- a/src/test/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr
+++ b/tests/ui/linkage-attr/linkage-detect-extern-generated-name-collision.stderr
diff --git a/src/test/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs
index c1df9ccef..c1df9ccef 100644
--- a/src/test/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs
+++ b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.rs
diff --git a/src/test/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr
index e0be1ac21..e0be1ac21 100644
--- a/src/test/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr
+++ b/tests/ui/linkage-attr/linkage-detect-local-generated-name-collision.stderr
diff --git a/src/test/ui/linkage-attr/linkage-import.rs b/tests/ui/linkage-attr/linkage-import.rs
index f754ddc6e..f754ddc6e 100644
--- a/src/test/ui/linkage-attr/linkage-import.rs
+++ b/tests/ui/linkage-attr/linkage-import.rs
diff --git a/src/test/ui/linkage-attr/linkage1.rs b/tests/ui/linkage-attr/linkage1.rs
index deab7a251..deab7a251 100644
--- a/src/test/ui/linkage-attr/linkage1.rs
+++ b/tests/ui/linkage-attr/linkage1.rs
diff --git a/src/test/ui/linkage-attr/linkage2.rs b/tests/ui/linkage-attr/linkage2.rs
index aa42874f7..aa42874f7 100644
--- a/src/test/ui/linkage-attr/linkage2.rs
+++ b/tests/ui/linkage-attr/linkage2.rs
diff --git a/src/test/ui/linkage-attr/linkage2.stderr b/tests/ui/linkage-attr/linkage2.stderr
index 7265f711f..7265f711f 100644
--- a/src/test/ui/linkage-attr/linkage2.stderr
+++ b/tests/ui/linkage-attr/linkage2.stderr
diff --git a/src/test/ui/linkage-attr/linkage3.rs b/tests/ui/linkage-attr/linkage3.rs
index 112eb1d3b..112eb1d3b 100644
--- a/src/test/ui/linkage-attr/linkage3.rs
+++ b/tests/ui/linkage-attr/linkage3.rs
diff --git a/src/test/ui/linkage-attr/linkage3.stderr b/tests/ui/linkage-attr/linkage3.stderr
index f2579c6e8..f2579c6e8 100644
--- a/src/test/ui/linkage-attr/linkage3.stderr
+++ b/tests/ui/linkage-attr/linkage3.stderr
diff --git a/src/test/ui/linkage-attr/linkage4.rs b/tests/ui/linkage-attr/linkage4.rs
index 3b935f972..3b935f972 100644
--- a/src/test/ui/linkage-attr/linkage4.rs
+++ b/tests/ui/linkage-attr/linkage4.rs
diff --git a/src/test/ui/linkage-attr/linkage4.stderr b/tests/ui/linkage-attr/linkage4.stderr
index 30d4d2b7b..30d4d2b7b 100644
--- a/src/test/ui/linkage-attr/linkage4.stderr
+++ b/tests/ui/linkage-attr/linkage4.stderr