From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tests/ui/crate-loading/auxiliary/crateresolve1-1.rs |  6 ++++++
 tests/ui/crate-loading/auxiliary/crateresolve1-2.rs |  6 ++++++
 tests/ui/crate-loading/auxiliary/crateresolve1-3.rs |  6 ++++++
 tests/ui/crate-loading/auxiliary/crateresolve2-1.rs |  5 +++++
 tests/ui/crate-loading/auxiliary/crateresolve2-2.rs |  5 +++++
 tests/ui/crate-loading/auxiliary/crateresolve2-3.rs |  5 +++++
 tests/ui/crate-loading/auxiliary/libfoo.rlib        |  0
 tests/ui/crate-loading/auxiliary/proc-macro.rs      | 12 ++++++++++++
 8 files changed, 45 insertions(+)
 create mode 100644 tests/ui/crate-loading/auxiliary/crateresolve1-1.rs
 create mode 100644 tests/ui/crate-loading/auxiliary/crateresolve1-2.rs
 create mode 100644 tests/ui/crate-loading/auxiliary/crateresolve1-3.rs
 create mode 100644 tests/ui/crate-loading/auxiliary/crateresolve2-1.rs
 create mode 100644 tests/ui/crate-loading/auxiliary/crateresolve2-2.rs
 create mode 100644 tests/ui/crate-loading/auxiliary/crateresolve2-3.rs
 create mode 100644 tests/ui/crate-loading/auxiliary/libfoo.rlib
 create mode 100644 tests/ui/crate-loading/auxiliary/proc-macro.rs

(limited to 'tests/ui/crate-loading/auxiliary')

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/tests/ui/crate-loading/auxiliary/crateresolve2-1.rs b/tests/ui/crate-loading/auxiliary/crateresolve2-1.rs
new file mode 100644
index 000000000..e9459ed07
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/crateresolve2-1.rs
@@ -0,0 +1,5 @@
+// compile-flags:-C extra-filename=-1 --emit=metadata
+#![crate_name = "crateresolve2"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 10 }
diff --git a/tests/ui/crate-loading/auxiliary/crateresolve2-2.rs b/tests/ui/crate-loading/auxiliary/crateresolve2-2.rs
new file mode 100644
index 000000000..c45416827
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/crateresolve2-2.rs
@@ -0,0 +1,5 @@
+// compile-flags:-C extra-filename=-2 --emit=metadata
+#![crate_name = "crateresolve2"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 20 }
diff --git a/tests/ui/crate-loading/auxiliary/crateresolve2-3.rs b/tests/ui/crate-loading/auxiliary/crateresolve2-3.rs
new file mode 100644
index 000000000..b356db4b6
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/crateresolve2-3.rs
@@ -0,0 +1,5 @@
+// compile-flags:-C extra-filename=-3 --emit=metadata
+#![crate_name = "crateresolve2"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 30 }
diff --git a/tests/ui/crate-loading/auxiliary/libfoo.rlib b/tests/ui/crate-loading/auxiliary/libfoo.rlib
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/ui/crate-loading/auxiliary/proc-macro.rs b/tests/ui/crate-loading/auxiliary/proc-macro.rs
new file mode 100644
index 000000000..52631de57
--- /dev/null
+++ b/tests/ui/crate-loading/auxiliary/proc-macro.rs
@@ -0,0 +1,12 @@
+// force-host
+// no-prefer-dynamic
+#![crate_name = "reproduction"]
+#![crate_type = "proc-macro"]
+
+extern crate proc_macro;
+use proc_macro::TokenStream;
+
+#[proc_macro]
+pub fn mac(input: TokenStream) -> TokenStream {
+    input
+}
-- 
cgit v1.2.3