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

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tests/ui/rfc-1717-dllimport/missing-link-attr.rs     | 4 ++++
 tests/ui/rfc-1717-dllimport/missing-link-attr.stderr | 4 ++++
 tests/ui/rfc-1717-dllimport/multiple-renames.rs      | 7 +++++++
 tests/ui/rfc-1717-dllimport/multiple-renames.stderr  | 4 ++++
 tests/ui/rfc-1717-dllimport/rename-modifiers.rs      | 9 +++++++++
 tests/ui/rfc-1717-dllimport/rename-modifiers.stderr  | 8 ++++++++
 tests/ui/rfc-1717-dllimport/rename-to-empty.rs       | 7 +++++++
 tests/ui/rfc-1717-dllimport/rename-to-empty.stderr   | 4 ++++
 8 files changed, 47 insertions(+)
 create mode 100644 tests/ui/rfc-1717-dllimport/missing-link-attr.rs
 create mode 100644 tests/ui/rfc-1717-dllimport/missing-link-attr.stderr
 create mode 100644 tests/ui/rfc-1717-dllimport/multiple-renames.rs
 create mode 100644 tests/ui/rfc-1717-dllimport/multiple-renames.stderr
 create mode 100644 tests/ui/rfc-1717-dllimport/rename-modifiers.rs
 create mode 100644 tests/ui/rfc-1717-dllimport/rename-modifiers.stderr
 create mode 100644 tests/ui/rfc-1717-dllimport/rename-to-empty.rs
 create mode 100644 tests/ui/rfc-1717-dllimport/rename-to-empty.stderr

(limited to 'tests/ui/rfc-1717-dllimport')

diff --git a/tests/ui/rfc-1717-dllimport/missing-link-attr.rs b/tests/ui/rfc-1717-dllimport/missing-link-attr.rs
new file mode 100644
index 000000000..b46d85160
--- /dev/null
+++ b/tests/ui/rfc-1717-dllimport/missing-link-attr.rs
@@ -0,0 +1,4 @@
+// compile-flags: -l foo:bar
+// error-pattern: renaming of the library `foo` was specified
+
+#![crate_type = "lib"]
diff --git a/tests/ui/rfc-1717-dllimport/missing-link-attr.stderr b/tests/ui/rfc-1717-dllimport/missing-link-attr.stderr
new file mode 100644
index 000000000..d4410e147
--- /dev/null
+++ b/tests/ui/rfc-1717-dllimport/missing-link-attr.stderr
@@ -0,0 +1,4 @@
+error: renaming of the library `foo` was specified, however this crate contains no `#[link(...)]` attributes referencing this library
+
+error: aborting due to previous error
+
diff --git a/tests/ui/rfc-1717-dllimport/multiple-renames.rs b/tests/ui/rfc-1717-dllimport/multiple-renames.rs
new file mode 100644
index 000000000..106f196b4
--- /dev/null
+++ b/tests/ui/rfc-1717-dllimport/multiple-renames.rs
@@ -0,0 +1,7 @@
+// compile-flags: -l foo:bar -l foo:baz
+// error-pattern: multiple renamings were specified for library
+
+#![crate_type = "lib"]
+
+#[link(name = "foo")]
+extern "C" {}
diff --git a/tests/ui/rfc-1717-dllimport/multiple-renames.stderr b/tests/ui/rfc-1717-dllimport/multiple-renames.stderr
new file mode 100644
index 000000000..a6fec9c4e
--- /dev/null
+++ b/tests/ui/rfc-1717-dllimport/multiple-renames.stderr
@@ -0,0 +1,4 @@
+error: multiple renamings were specified for library `foo`
+
+error: aborting due to previous error
+
diff --git a/tests/ui/rfc-1717-dllimport/rename-modifiers.rs b/tests/ui/rfc-1717-dllimport/rename-modifiers.rs
new file mode 100644
index 000000000..30f4db718
--- /dev/null
+++ b/tests/ui/rfc-1717-dllimport/rename-modifiers.rs
@@ -0,0 +1,9 @@
+// compile-flags: -l dylib=foo:bar
+// error-pattern: overriding linking modifiers from command line is not supported
+
+#![feature(native_link_modifiers_as_needed)]
+
+#![crate_type = "lib"]
+
+#[link(name = "foo", kind = "dylib", modifiers = "-as-needed")]
+extern "C" {}
diff --git a/tests/ui/rfc-1717-dllimport/rename-modifiers.stderr b/tests/ui/rfc-1717-dllimport/rename-modifiers.stderr
new file mode 100644
index 000000000..bee639bf2
--- /dev/null
+++ b/tests/ui/rfc-1717-dllimport/rename-modifiers.stderr
@@ -0,0 +1,8 @@
+error: overriding linking modifiers from command line is not supported
+  --> $DIR/rename-modifiers.rs:9:1
+   |
+LL | extern "C" {}
+   | ^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/tests/ui/rfc-1717-dllimport/rename-to-empty.rs b/tests/ui/rfc-1717-dllimport/rename-to-empty.rs
new file mode 100644
index 000000000..9356c4129
--- /dev/null
+++ b/tests/ui/rfc-1717-dllimport/rename-to-empty.rs
@@ -0,0 +1,7 @@
+// compile-flags: -l foo:
+// error-pattern: an empty renaming target was specified for library
+
+#![crate_type = "lib"]
+
+#[link(name = "foo")]
+extern "C" {}
diff --git a/tests/ui/rfc-1717-dllimport/rename-to-empty.stderr b/tests/ui/rfc-1717-dllimport/rename-to-empty.stderr
new file mode 100644
index 000000000..aca839d80
--- /dev/null
+++ b/tests/ui/rfc-1717-dllimport/rename-to-empty.stderr
@@ -0,0 +1,4 @@
+error: an empty renaming target was specified for library `foo`
+
+error: aborting due to previous error
+
-- 
cgit v1.2.3