Merging upstream version 1.68.2+dfsg1.

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

11 files changed, 1 insertions, 0 deletions

diff --git a/src/test/ui/extern/auxiliary/extern-take-value.rs b/tests/ui/extern/auxiliary/extern-take-value.rs
index 56256aa19..56256aa19 100644
--- a/src/test/ui/extern/auxiliary/extern-take-value.rs
+++ b/tests/ui/extern/auxiliary/extern-take-value.rs
diff --git a/src/test/ui/extern/auxiliary/extern-types-inherent-impl.rs b/tests/ui/extern/auxiliary/extern-types-inherent-impl.rs
index a1efe1818..a1efe1818 100644
--- a/src/test/ui/extern/auxiliary/extern-types-inherent-impl.rs
+++ b/tests/ui/extern/auxiliary/extern-types-inherent-impl.rs
diff --git a/src/test/ui/extern/auxiliary/extern_calling_convention.rs b/tests/ui/extern/auxiliary/extern_calling_convention.rs
index e24cf9fda..e24cf9fda 100644
--- a/src/test/ui/extern/auxiliary/extern_calling_convention.rs
+++ b/tests/ui/extern/auxiliary/extern_calling_convention.rs
diff --git a/src/test/ui/extern/auxiliary/extern_mod_ordering_lib.rs b/tests/ui/extern/auxiliary/extern_mod_ordering_lib.rs
index 7357f5970..7357f5970 100644
--- a/src/test/ui/extern/auxiliary/extern_mod_ordering_lib.rs
+++ b/tests/ui/extern/auxiliary/extern_mod_ordering_lib.rs
diff --git a/src/test/ui/extern/auxiliary/fat_drop.rs b/tests/ui/extern/auxiliary/fat_drop.rs
index 768d29876..768d29876 100644
--- a/src/test/ui/extern/auxiliary/fat_drop.rs
+++ b/tests/ui/extern/auxiliary/fat_drop.rs
diff --git a/src/test/ui/extern/auxiliary/invalid-utf8.txt b/tests/ui/extern/auxiliary/invalid-utf8.txt
index dc1115b82..dc1115b82 100644
--- a/src/test/ui/extern/auxiliary/invalid-utf8.txt
+++ b/tests/ui/extern/auxiliary/invalid-utf8.txt
diff --git a/src/test/ui/extern/auxiliary/issue-80074-macro.rs b/tests/ui/extern/auxiliary/issue-80074-macro.rs
index 30e0f19ab..30e0f19ab 100644
--- a/src/test/ui/extern/auxiliary/issue-80074-macro.rs
+++ b/tests/ui/extern/auxiliary/issue-80074-macro.rs
diff --git a/src/test/ui/extern/auxiliary/m1.rs b/tests/ui/extern/auxiliary/m1.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/ui/extern/auxiliary/m1.rs
+++ b/tests/ui/extern/auxiliary/m1.rs
diff --git a/tests/ui/extern/auxiliary/m2.rs b/tests/ui/extern/auxiliary/m2.rs
new file mode 100644
index 000000000..c5c0bc606
--- /dev/null
+++ b/tests/ui/extern/auxiliary/m2.rs
@@ -0,0 +1 @@
+pub fn bar() {}
diff --git a/src/test/ui/extern/auxiliary/no-mangle-associated-fn.rs b/tests/ui/extern/auxiliary/no-mangle-associated-fn.rs
index 7fc73c76c..7fc73c76c 100644
--- a/src/test/ui/extern/auxiliary/no-mangle-associated-fn.rs
+++ b/tests/ui/extern/auxiliary/no-mangle-associated-fn.rs
diff --git a/src/test/ui/extern/auxiliary/reexport-should-still-link.rs b/tests/ui/extern/auxiliary/reexport-should-still-link.rs
index 237ea8dfc..237ea8dfc 100644
--- a/src/test/ui/extern/auxiliary/reexport-should-still-link.rs
+++ b/tests/ui/extern/auxiliary/reexport-should-still-link.rs