Merging upstream version 1.68.2+dfsg1.

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

8 files changed, 18 insertions, 0 deletions

diff --git a/tests/ui/crate-loading/auxiliary/crateresolve1-1.rs b/tests/ui/crate-loading/auxiliary/crateresolve1-1.rs
new file mode 100644
index 000000000..bd9c8483e
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/crateresolve1-1.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-1
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 10 }
diff --git a/tests/ui/crate-loading/auxiliary/crateresolve1-2.rs b/tests/ui/crate-loading/auxiliary/crateresolve1-2.rs
new file mode 100644
index 000000000..bd0f08f45
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/crateresolve1-2.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-2
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 20 }
diff --git a/tests/ui/crate-loading/auxiliary/crateresolve1-3.rs b/tests/ui/crate-loading/auxiliary/crateresolve1-3.rs
new file mode 100644
index 000000000..1226c2fbb
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/crateresolve1-3.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-3
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 30 }
diff --git a/src/test/ui/crate-loading/auxiliary/crateresolve2-1.rs b/tests/ui/crate-loading/auxiliary/crateresolve2-1.rs
index e9459ed07..e9459ed07 100644
--- a/src/test/ui/crate-loading/auxiliary/crateresolve2-1.rs
+++ b/tests/ui/crate-loading/auxiliary/crateresolve2-1.rs
diff --git a/src/test/ui/crate-loading/auxiliary/crateresolve2-2.rs b/tests/ui/crate-loading/auxiliary/crateresolve2-2.rs
index c45416827..c45416827 100644
--- a/src/test/ui/crate-loading/auxiliary/crateresolve2-2.rs
+++ b/tests/ui/crate-loading/auxiliary/crateresolve2-2.rs
diff --git a/src/test/ui/crate-loading/auxiliary/crateresolve2-3.rs b/tests/ui/crate-loading/auxiliary/crateresolve2-3.rs
index b356db4b6..b356db4b6 100644
--- a/src/test/ui/crate-loading/auxiliary/crateresolve2-3.rs
+++ b/tests/ui/crate-loading/auxiliary/crateresolve2-3.rs
diff --git a/src/test/ui/crate-loading/auxiliary/libfoo.rlib b/tests/ui/crate-loading/auxiliary/libfoo.rlib
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/crate-loading/auxiliary/libfoo.rlib
+++ b/tests/ui/crate-loading/auxiliary/libfoo.rlib
diff --git a/src/test/ui/crate-loading/auxiliary/proc-macro.rs b/tests/ui/crate-loading/auxiliary/proc-macro.rs
index 52631de57..52631de57 100644
--- a/src/test/ui/crate-loading/auxiliary/proc-macro.rs
+++ b/tests/ui/crate-loading/auxiliary/proc-macro.rs