about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeón Orell Valerian Liehr <me@fmease.dev>2024-12-09 23:39:03 +0100
committerGitHub <noreply@github.com>2024-12-09 23:39:03 +0100
commitdf5ec039fad7b16a16fcd86eadc0d9e5a14a9e26 (patch)
tree42759ab74da5c7c6c2196246f23e66f990e0ad68
parenta224f3807e58afc9353510f1d556c607d367545d (diff)
parent0a48b96859d3d66138082ffad6a1057b54cd55c7 (diff)
downloadrust-df5ec039fad7b16a16fcd86eadc0d9e5a14a9e26.tar.gz
rust-df5ec039fad7b16a16fcd86eadc0d9e5a14a9e26.zip
Rollup merge of #133996 - Zalathar:ui-link-native-libs, r=jieyouxu
Move most tests for `-l` and `#[link(..)]` into `tests/ui/link-native-libs`

Tests for the closely-related `-l` flag and `#[link(..)]` attribute are spread across a few different directories, and in some cases have ended up in a test directory intended for other linker-related functionality.

This PR moves most of them into a single `tests/ui/link-native-libs` directory.

---

Part of #133895.

try-job: i686-mingw

r? jieyouxu
-rw-r--r--src/tools/tidy/src/issues.txt10
-rw-r--r--src/tools/tidy/src/ui_tests.rs2
-rw-r--r--tests/ui/link-native-libs/auxiliary/link-cfg-works-transitive-dylib.rs (renamed from tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs)0
-rw-r--r--tests/ui/link-native-libs/auxiliary/link-cfg-works-transitive-rlib.rs (renamed from tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs)0
-rw-r--r--tests/ui/link-native-libs/empty-kind-1.rs (renamed from tests/ui/native-library-link-flags/empty-kind-1.rs)0
-rw-r--r--tests/ui/link-native-libs/empty-kind-1.stderr (renamed from tests/ui/native-library-link-flags/empty-kind-1.stderr)0
-rw-r--r--tests/ui/link-native-libs/empty-kind-2.rs (renamed from tests/ui/native-library-link-flags/empty-kind-2.rs)0
-rw-r--r--tests/ui/link-native-libs/empty-kind-2.stderr (renamed from tests/ui/native-library-link-flags/empty-kind-2.stderr)0
-rw-r--r--tests/ui/link-native-libs/issue-109144.rs (renamed from tests/ui/linkage-attr/issue-109144.rs)0
-rw-r--r--tests/ui/link-native-libs/issue-109144.stderr (renamed from tests/ui/linkage-attr/issue-109144.stderr)0
-rw-r--r--tests/ui/link-native-libs/issue-43925.rs (renamed from tests/ui/issues/issue-43925.rs)0
-rw-r--r--tests/ui/link-native-libs/issue-43925.stderr (renamed from tests/ui/issues/issue-43925.stderr)0
-rw-r--r--tests/ui/link-native-libs/issue-43926.rs (renamed from tests/ui/issues/issue-43926.rs)0
-rw-r--r--tests/ui/link-native-libs/issue-43926.stderr (renamed from tests/ui/issues/issue-43926.stderr)0
-rw-r--r--tests/ui/link-native-libs/issue-70093/issue-70093-link-directives.rs (renamed from tests/ui/issues/issue-70093/issue-70093-link-directives.rs)0
-rw-r--r--tests/ui/link-native-libs/issue-70093/issue-70093.rs (renamed from tests/ui/issues/issue-70093/issue-70093.rs)0
-rw-r--r--tests/ui/link-native-libs/kind-framework.rs (renamed from tests/ui/linkage-attr/kind-framework.rs)0
-rw-r--r--tests/ui/link-native-libs/kind-framework.stderr (renamed from tests/ui/linkage-attr/kind-framework.stderr)0
-rw-r--r--tests/ui/link-native-libs/link-arg-error.rs (renamed from tests/ui/native-library-link-flags/link-arg-error.rs)0
-rw-r--r--tests/ui/link-native-libs/link-arg-error.stderr (renamed from tests/ui/native-library-link-flags/link-arg-error.stderr)0
-rw-r--r--tests/ui/link-native-libs/link-arg-from-rs.rs (renamed from tests/ui/native-library-link-flags/link-arg-from-rs.rs)0
-rw-r--r--tests/ui/link-native-libs/link-arg-from-rs.stderr (renamed from tests/ui/native-library-link-flags/link-arg-from-rs.stderr)0
-rw-r--r--tests/ui/link-native-libs/link-attr-validation-early.rs (renamed from tests/ui/linkage-attr/link-attr-validation-early.rs)0
-rw-r--r--tests/ui/link-native-libs/link-attr-validation-early.stderr (renamed from tests/ui/linkage-attr/link-attr-validation-early.stderr)0
-rw-r--r--tests/ui/link-native-libs/link-attr-validation-late.rs (renamed from tests/ui/linkage-attr/link-attr-validation-late.rs)0
-rw-r--r--tests/ui/link-native-libs/link-attr-validation-late.stderr (renamed from tests/ui/linkage-attr/link-attr-validation-late.stderr)0
-rw-r--r--tests/ui/link-native-libs/link-cfg-works.rs (renamed from tests/ui/linkage-attr/link-cfg-works.rs)0
-rw-r--r--tests/ui/link-native-libs/manual-link-bad-form.rs (renamed from tests/ui/manual/manual-link-bad-form.rs)0
-rw-r--r--tests/ui/link-native-libs/manual-link-bad-form.stderr (renamed from tests/ui/manual/manual-link-bad-form.stderr)0
-rw-r--r--tests/ui/link-native-libs/manual-link-bad-kind.rs (renamed from tests/ui/manual/manual-link-bad-kind.rs)0
-rw-r--r--tests/ui/link-native-libs/manual-link-bad-kind.stderr (renamed from tests/ui/manual/manual-link-bad-kind.stderr)0
-rw-r--r--tests/ui/link-native-libs/manual-link-bad-search-path.rs (renamed from tests/ui/manual/manual-link-bad-search-path.rs)0
-rw-r--r--tests/ui/link-native-libs/manual-link-bad-search-path.stderr (renamed from tests/ui/manual/manual-link-bad-search-path.stderr)0
-rw-r--r--tests/ui/link-native-libs/manual-link-framework.rs (renamed from tests/ui/manual/manual-link-framework.rs)0
-rw-r--r--tests/ui/link-native-libs/manual-link-framework.stderr (renamed from tests/ui/manual/manual-link-framework.stderr)0
-rw-r--r--tests/ui/link-native-libs/manual-link-unsupported-kind.rs (renamed from tests/ui/manual/manual-link-unsupported-kind.rs)0
-rw-r--r--tests/ui/link-native-libs/manual-link-unsupported-kind.stderr (renamed from tests/ui/manual/manual-link-unsupported-kind.stderr)0
-rw-r--r--tests/ui/link-native-libs/modifiers-bad.blank.stderr (renamed from tests/ui/native-library-link-flags/modifiers-bad.blank.stderr)0
-rw-r--r--tests/ui/link-native-libs/modifiers-bad.no-prefix.stderr (renamed from tests/ui/native-library-link-flags/modifiers-bad.no-prefix.stderr)0
-rw-r--r--tests/ui/link-native-libs/modifiers-bad.prefix-only.stderr (renamed from tests/ui/native-library-link-flags/modifiers-bad.prefix-only.stderr)0
-rw-r--r--tests/ui/link-native-libs/modifiers-bad.rs (renamed from tests/ui/native-library-link-flags/modifiers-bad.rs)0
-rw-r--r--tests/ui/link-native-libs/modifiers-bad.unknown.stderr (renamed from tests/ui/native-library-link-flags/modifiers-bad.unknown.stderr)0
-rw-r--r--tests/ui/link-native-libs/modifiers-override-2.rs (renamed from tests/ui/native-library-link-flags/modifiers-override-2.rs)0
-rw-r--r--tests/ui/link-native-libs/modifiers-override-2.stderr (renamed from tests/ui/native-library-link-flags/modifiers-override-2.stderr)0
-rw-r--r--tests/ui/link-native-libs/modifiers-override-3.rs (renamed from tests/ui/native-library-link-flags/modifiers-override-3.rs)0
-rw-r--r--tests/ui/link-native-libs/modifiers-override-3.stderr (renamed from tests/ui/native-library-link-flags/modifiers-override-3.stderr)0
-rw-r--r--tests/ui/link-native-libs/modifiers-override.rs (renamed from tests/ui/native-library-link-flags/modifiers-override.rs)0
-rw-r--r--tests/ui/link-native-libs/modifiers-override.stderr (renamed from tests/ui/native-library-link-flags/modifiers-override.stderr)0
-rw-r--r--tests/ui/link-native-libs/msvc-non-utf8-output.rs (renamed from tests/ui/native-library-link-flags/msvc-non-utf8-output.rs)0
-rw-r--r--tests/ui/link-native-libs/msvc-non-utf8-output.stderr (renamed from tests/ui/native-library-link-flags/msvc-non-utf8-output.stderr)0
-rw-r--r--tests/ui/link-native-libs/suggest-libname-only-1.rs (renamed from tests/ui/native-library-link-flags/suggest-libname-only-1.rs)0
-rw-r--r--tests/ui/link-native-libs/suggest-libname-only-1.stderr (renamed from tests/ui/native-library-link-flags/suggest-libname-only-1.stderr)0
-rw-r--r--tests/ui/link-native-libs/suggest-libname-only-2.rs (renamed from tests/ui/native-library-link-flags/suggest-libname-only-2.rs)0
-rw-r--r--tests/ui/link-native-libs/suggest-libname-only-2.stderr (renamed from tests/ui/native-library-link-flags/suggest-libname-only-2.stderr)0
-rw-r--r--tests/ui/link-native-libs/uikit-framework.rs (renamed from tests/ui/linkage-attr/uikit-framework.rs)0
55 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 3a021e189f3..25cd32063aa 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -2295,8 +2295,6 @@ ui/issues/issue-43853.rs
 ui/issues/issue-4387.rs
 ui/issues/issue-43910.rs
 ui/issues/issue-43923.rs
-ui/issues/issue-43925.rs
-ui/issues/issue-43926.rs
 ui/issues/issue-43988.rs
 ui/issues/issue-44023.rs
 ui/issues/issue-44056.rs
@@ -2545,8 +2543,6 @@ ui/issues/issue-6936.rs
 ui/issues/issue-69455.rs
 ui/issues/issue-69602-type-err-during-codegen-ice.rs
 ui/issues/issue-69683.rs
-ui/issues/issue-70093/issue-70093-link-directives.rs
-ui/issues/issue-70093/issue-70093.rs
 ui/issues/issue-7012.rs
 ui/issues/issue-70381.rs
 ui/issues/issue-7044.rs
@@ -2711,11 +2707,15 @@ ui/limits/issue-17913.rs
 ui/limits/issue-55878.rs
 ui/limits/issue-69485-var-size-diffs-too-large.rs
 ui/limits/issue-75158-64.rs
+ui/link-native-libs/issue-109144.rs
+ui/link-native-libs/issue-43925.rs
+ui/link-native-libs/issue-43926.rs
+ui/link-native-libs/issue-70093/issue-70093-link-directives.rs
+ui/link-native-libs/issue-70093/issue-70093.rs
 ui/linkage-attr/auxiliary/issue-12133-dylib.rs
 ui/linkage-attr/auxiliary/issue-12133-dylib2.rs
 ui/linkage-attr/auxiliary/issue-12133-rlib.rs
 ui/linkage-attr/issue-10755.rs
-ui/linkage-attr/issue-109144.rs
 ui/linkage-attr/issue-12133-1.rs
 ui/linkage-attr/issue-12133-2.rs
 ui/linkage-attr/issue-12133-3.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 11f9d5bb03d..401169c838f 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -17,7 +17,7 @@ use ignore::Walk;
 const ENTRY_LIMIT: u32 = 901;
 // FIXME: The following limits should be reduced eventually.
 
-const ISSUES_ENTRY_LIMIT: u32 = 1672;
+const ISSUES_ENTRY_LIMIT: u32 = 1667;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files
diff --git a/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs b/tests/ui/link-native-libs/auxiliary/link-cfg-works-transitive-dylib.rs
index 0d927117d81..0d927117d81 100644
--- a/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-dylib.rs
+++ b/tests/ui/link-native-libs/auxiliary/link-cfg-works-transitive-dylib.rs
diff --git a/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs b/tests/ui/link-native-libs/auxiliary/link-cfg-works-transitive-rlib.rs
index 49a46b202e4..49a46b202e4 100644
--- a/tests/ui/linkage-attr/auxiliary/link-cfg-works-transitive-rlib.rs
+++ b/tests/ui/link-native-libs/auxiliary/link-cfg-works-transitive-rlib.rs
diff --git a/tests/ui/native-library-link-flags/empty-kind-1.rs b/tests/ui/link-native-libs/empty-kind-1.rs
index d9b8d8a7f7d..d9b8d8a7f7d 100644
--- a/tests/ui/native-library-link-flags/empty-kind-1.rs
+++ b/tests/ui/link-native-libs/empty-kind-1.rs
diff --git a/tests/ui/native-library-link-flags/empty-kind-1.stderr b/tests/ui/link-native-libs/empty-kind-1.stderr
index 3e5b0549339..3e5b0549339 100644
--- a/tests/ui/native-library-link-flags/empty-kind-1.stderr
+++ b/tests/ui/link-native-libs/empty-kind-1.stderr
diff --git a/tests/ui/native-library-link-flags/empty-kind-2.rs b/tests/ui/link-native-libs/empty-kind-2.rs
index 16cb3b917e4..16cb3b917e4 100644
--- a/tests/ui/native-library-link-flags/empty-kind-2.rs
+++ b/tests/ui/link-native-libs/empty-kind-2.rs
diff --git a/tests/ui/native-library-link-flags/empty-kind-2.stderr b/tests/ui/link-native-libs/empty-kind-2.stderr
index 3e5b0549339..3e5b0549339 100644
--- a/tests/ui/native-library-link-flags/empty-kind-2.stderr
+++ b/tests/ui/link-native-libs/empty-kind-2.stderr
diff --git a/tests/ui/linkage-attr/issue-109144.rs b/tests/ui/link-native-libs/issue-109144.rs
index 2f740e55389..2f740e55389 100644
--- a/tests/ui/linkage-attr/issue-109144.rs
+++ b/tests/ui/link-native-libs/issue-109144.rs
diff --git a/tests/ui/linkage-attr/issue-109144.stderr b/tests/ui/link-native-libs/issue-109144.stderr
index 0748d94189c..0748d94189c 100644
--- a/tests/ui/linkage-attr/issue-109144.stderr
+++ b/tests/ui/link-native-libs/issue-109144.stderr
diff --git a/tests/ui/issues/issue-43925.rs b/tests/ui/link-native-libs/issue-43925.rs
index 1a210887154..1a210887154 100644
--- a/tests/ui/issues/issue-43925.rs
+++ b/tests/ui/link-native-libs/issue-43925.rs
diff --git a/tests/ui/issues/issue-43925.stderr b/tests/ui/link-native-libs/issue-43925.stderr
index 7cc347c6163..7cc347c6163 100644
--- a/tests/ui/issues/issue-43925.stderr
+++ b/tests/ui/link-native-libs/issue-43925.stderr
diff --git a/tests/ui/issues/issue-43926.rs b/tests/ui/link-native-libs/issue-43926.rs
index 6d3003552dc..6d3003552dc 100644
--- a/tests/ui/issues/issue-43926.rs
+++ b/tests/ui/link-native-libs/issue-43926.rs
diff --git a/tests/ui/issues/issue-43926.stderr b/tests/ui/link-native-libs/issue-43926.stderr
index 7c5c50a38a9..7c5c50a38a9 100644
--- a/tests/ui/issues/issue-43926.stderr
+++ b/tests/ui/link-native-libs/issue-43926.stderr
diff --git a/tests/ui/issues/issue-70093/issue-70093-link-directives.rs b/tests/ui/link-native-libs/issue-70093/issue-70093-link-directives.rs
index 9c60affbccd..9c60affbccd 100644
--- a/tests/ui/issues/issue-70093/issue-70093-link-directives.rs
+++ b/tests/ui/link-native-libs/issue-70093/issue-70093-link-directives.rs
diff --git a/tests/ui/issues/issue-70093/issue-70093.rs b/tests/ui/link-native-libs/issue-70093/issue-70093.rs
index 86974239338..86974239338 100644
--- a/tests/ui/issues/issue-70093/issue-70093.rs
+++ b/tests/ui/link-native-libs/issue-70093/issue-70093.rs
diff --git a/tests/ui/linkage-attr/kind-framework.rs b/tests/ui/link-native-libs/kind-framework.rs
index c2f90809e03..c2f90809e03 100644
--- a/tests/ui/linkage-attr/kind-framework.rs
+++ b/tests/ui/link-native-libs/kind-framework.rs
diff --git a/tests/ui/linkage-attr/kind-framework.stderr b/tests/ui/link-native-libs/kind-framework.stderr
index 93dacd68e29..93dacd68e29 100644
--- a/tests/ui/linkage-attr/kind-framework.stderr
+++ b/tests/ui/link-native-libs/kind-framework.stderr
diff --git a/tests/ui/native-library-link-flags/link-arg-error.rs b/tests/ui/link-native-libs/link-arg-error.rs
index 4defb108178..4defb108178 100644
--- a/tests/ui/native-library-link-flags/link-arg-error.rs
+++ b/tests/ui/link-native-libs/link-arg-error.rs
diff --git a/tests/ui/native-library-link-flags/link-arg-error.stderr b/tests/ui/link-native-libs/link-arg-error.stderr
index e1d01e14152..e1d01e14152 100644
--- a/tests/ui/native-library-link-flags/link-arg-error.stderr
+++ b/tests/ui/link-native-libs/link-arg-error.stderr
diff --git a/tests/ui/native-library-link-flags/link-arg-from-rs.rs b/tests/ui/link-native-libs/link-arg-from-rs.rs
index 4a6017fea33..4a6017fea33 100644
--- a/tests/ui/native-library-link-flags/link-arg-from-rs.rs
+++ b/tests/ui/link-native-libs/link-arg-from-rs.rs
diff --git a/tests/ui/native-library-link-flags/link-arg-from-rs.stderr b/tests/ui/link-native-libs/link-arg-from-rs.stderr
index f31e15f1da6..f31e15f1da6 100644
--- a/tests/ui/native-library-link-flags/link-arg-from-rs.stderr
+++ b/tests/ui/link-native-libs/link-arg-from-rs.stderr
diff --git a/tests/ui/linkage-attr/link-attr-validation-early.rs b/tests/ui/link-native-libs/link-attr-validation-early.rs
index b9a835fb5e9..b9a835fb5e9 100644
--- a/tests/ui/linkage-attr/link-attr-validation-early.rs
+++ b/tests/ui/link-native-libs/link-attr-validation-early.rs
diff --git a/tests/ui/linkage-attr/link-attr-validation-early.stderr b/tests/ui/link-native-libs/link-attr-validation-early.stderr
index 24ad9d825f8..24ad9d825f8 100644
--- a/tests/ui/linkage-attr/link-attr-validation-early.stderr
+++ b/tests/ui/link-native-libs/link-attr-validation-early.stderr
diff --git a/tests/ui/linkage-attr/link-attr-validation-late.rs b/tests/ui/link-native-libs/link-attr-validation-late.rs
index 34f720dd2d3..34f720dd2d3 100644
--- a/tests/ui/linkage-attr/link-attr-validation-late.rs
+++ b/tests/ui/link-native-libs/link-attr-validation-late.rs
diff --git a/tests/ui/linkage-attr/link-attr-validation-late.stderr b/tests/ui/link-native-libs/link-attr-validation-late.stderr
index 1ad5fbaf7de..1ad5fbaf7de 100644
--- a/tests/ui/linkage-attr/link-attr-validation-late.stderr
+++ b/tests/ui/link-native-libs/link-attr-validation-late.stderr
diff --git a/tests/ui/linkage-attr/link-cfg-works.rs b/tests/ui/link-native-libs/link-cfg-works.rs
index 7b936bc43b1..7b936bc43b1 100644
--- a/tests/ui/linkage-attr/link-cfg-works.rs
+++ b/tests/ui/link-native-libs/link-cfg-works.rs
diff --git a/tests/ui/manual/manual-link-bad-form.rs b/tests/ui/link-native-libs/manual-link-bad-form.rs
index 0f5723adec9..0f5723adec9 100644
--- a/tests/ui/manual/manual-link-bad-form.rs
+++ b/tests/ui/link-native-libs/manual-link-bad-form.rs
diff --git a/tests/ui/manual/manual-link-bad-form.stderr b/tests/ui/link-native-libs/manual-link-bad-form.stderr
index 7fd7a1066b4..7fd7a1066b4 100644
--- a/tests/ui/manual/manual-link-bad-form.stderr
+++ b/tests/ui/link-native-libs/manual-link-bad-form.stderr
diff --git a/tests/ui/manual/manual-link-bad-kind.rs b/tests/ui/link-native-libs/manual-link-bad-kind.rs
index d070faa6574..d070faa6574 100644
--- a/tests/ui/manual/manual-link-bad-kind.rs
+++ b/tests/ui/link-native-libs/manual-link-bad-kind.rs
diff --git a/tests/ui/manual/manual-link-bad-kind.stderr b/tests/ui/link-native-libs/manual-link-bad-kind.stderr
index 647c4c61e02..647c4c61e02 100644
--- a/tests/ui/manual/manual-link-bad-kind.stderr
+++ b/tests/ui/link-native-libs/manual-link-bad-kind.stderr
diff --git a/tests/ui/manual/manual-link-bad-search-path.rs b/tests/ui/link-native-libs/manual-link-bad-search-path.rs
index c9ced4734fc..c9ced4734fc 100644
--- a/tests/ui/manual/manual-link-bad-search-path.rs
+++ b/tests/ui/link-native-libs/manual-link-bad-search-path.rs
diff --git a/tests/ui/manual/manual-link-bad-search-path.stderr b/tests/ui/link-native-libs/manual-link-bad-search-path.stderr
index 2c0649ea152..2c0649ea152 100644
--- a/tests/ui/manual/manual-link-bad-search-path.stderr
+++ b/tests/ui/link-native-libs/manual-link-bad-search-path.stderr
diff --git a/tests/ui/manual/manual-link-framework.rs b/tests/ui/link-native-libs/manual-link-framework.rs
index 43cdda0a4e6..43cdda0a4e6 100644
--- a/tests/ui/manual/manual-link-framework.rs
+++ b/tests/ui/link-native-libs/manual-link-framework.rs
diff --git a/tests/ui/manual/manual-link-framework.stderr b/tests/ui/link-native-libs/manual-link-framework.stderr
index 38d2302a48d..38d2302a48d 100644
--- a/tests/ui/manual/manual-link-framework.stderr
+++ b/tests/ui/link-native-libs/manual-link-framework.stderr
diff --git a/tests/ui/manual/manual-link-unsupported-kind.rs b/tests/ui/link-native-libs/manual-link-unsupported-kind.rs
index b5b9e3e6577..b5b9e3e6577 100644
--- a/tests/ui/manual/manual-link-unsupported-kind.rs
+++ b/tests/ui/link-native-libs/manual-link-unsupported-kind.rs
diff --git a/tests/ui/manual/manual-link-unsupported-kind.stderr b/tests/ui/link-native-libs/manual-link-unsupported-kind.stderr
index ae4a1ec9a95..ae4a1ec9a95 100644
--- a/tests/ui/manual/manual-link-unsupported-kind.stderr
+++ b/tests/ui/link-native-libs/manual-link-unsupported-kind.stderr
diff --git a/tests/ui/native-library-link-flags/modifiers-bad.blank.stderr b/tests/ui/link-native-libs/modifiers-bad.blank.stderr
index ea36af0b4cf..ea36af0b4cf 100644
--- a/tests/ui/native-library-link-flags/modifiers-bad.blank.stderr
+++ b/tests/ui/link-native-libs/modifiers-bad.blank.stderr
diff --git a/tests/ui/native-library-link-flags/modifiers-bad.no-prefix.stderr b/tests/ui/link-native-libs/modifiers-bad.no-prefix.stderr
index ea36af0b4cf..ea36af0b4cf 100644
--- a/tests/ui/native-library-link-flags/modifiers-bad.no-prefix.stderr
+++ b/tests/ui/link-native-libs/modifiers-bad.no-prefix.stderr
diff --git a/tests/ui/native-library-link-flags/modifiers-bad.prefix-only.stderr b/tests/ui/link-native-libs/modifiers-bad.prefix-only.stderr
index 1e701374688..1e701374688 100644
--- a/tests/ui/native-library-link-flags/modifiers-bad.prefix-only.stderr
+++ b/tests/ui/link-native-libs/modifiers-bad.prefix-only.stderr
diff --git a/tests/ui/native-library-link-flags/modifiers-bad.rs b/tests/ui/link-native-libs/modifiers-bad.rs
index 185201e0d84..185201e0d84 100644
--- a/tests/ui/native-library-link-flags/modifiers-bad.rs
+++ b/tests/ui/link-native-libs/modifiers-bad.rs
diff --git a/tests/ui/native-library-link-flags/modifiers-bad.unknown.stderr b/tests/ui/link-native-libs/modifiers-bad.unknown.stderr
index 75950ad9c64..75950ad9c64 100644
--- a/tests/ui/native-library-link-flags/modifiers-bad.unknown.stderr
+++ b/tests/ui/link-native-libs/modifiers-bad.unknown.stderr
diff --git a/tests/ui/native-library-link-flags/modifiers-override-2.rs b/tests/ui/link-native-libs/modifiers-override-2.rs
index a462a741ac6..a462a741ac6 100644
--- a/tests/ui/native-library-link-flags/modifiers-override-2.rs
+++ b/tests/ui/link-native-libs/modifiers-override-2.rs
diff --git a/tests/ui/native-library-link-flags/modifiers-override-2.stderr b/tests/ui/link-native-libs/modifiers-override-2.stderr
index aa5b59c5b6f..aa5b59c5b6f 100644
--- a/tests/ui/native-library-link-flags/modifiers-override-2.stderr
+++ b/tests/ui/link-native-libs/modifiers-override-2.stderr
diff --git a/tests/ui/native-library-link-flags/modifiers-override-3.rs b/tests/ui/link-native-libs/modifiers-override-3.rs
index d05735ad616..d05735ad616 100644
--- a/tests/ui/native-library-link-flags/modifiers-override-3.rs
+++ b/tests/ui/link-native-libs/modifiers-override-3.rs
diff --git a/tests/ui/native-library-link-flags/modifiers-override-3.stderr b/tests/ui/link-native-libs/modifiers-override-3.stderr
index 3eb9459f6f3..3eb9459f6f3 100644
--- a/tests/ui/native-library-link-flags/modifiers-override-3.stderr
+++ b/tests/ui/link-native-libs/modifiers-override-3.stderr
diff --git a/tests/ui/native-library-link-flags/modifiers-override.rs b/tests/ui/link-native-libs/modifiers-override.rs
index cd2d003664a..cd2d003664a 100644
--- a/tests/ui/native-library-link-flags/modifiers-override.rs
+++ b/tests/ui/link-native-libs/modifiers-override.rs
diff --git a/tests/ui/native-library-link-flags/modifiers-override.stderr b/tests/ui/link-native-libs/modifiers-override.stderr
index 64427651e9f..64427651e9f 100644
--- a/tests/ui/native-library-link-flags/modifiers-override.stderr
+++ b/tests/ui/link-native-libs/modifiers-override.stderr
diff --git a/tests/ui/native-library-link-flags/msvc-non-utf8-output.rs b/tests/ui/link-native-libs/msvc-non-utf8-output.rs
index 659a832247a..659a832247a 100644
--- a/tests/ui/native-library-link-flags/msvc-non-utf8-output.rs
+++ b/tests/ui/link-native-libs/msvc-non-utf8-output.rs
diff --git a/tests/ui/native-library-link-flags/msvc-non-utf8-output.stderr b/tests/ui/link-native-libs/msvc-non-utf8-output.stderr
index 7f3ef376447..7f3ef376447 100644
--- a/tests/ui/native-library-link-flags/msvc-non-utf8-output.stderr
+++ b/tests/ui/link-native-libs/msvc-non-utf8-output.stderr
diff --git a/tests/ui/native-library-link-flags/suggest-libname-only-1.rs b/tests/ui/link-native-libs/suggest-libname-only-1.rs
index 328181fb5cb..328181fb5cb 100644
--- a/tests/ui/native-library-link-flags/suggest-libname-only-1.rs
+++ b/tests/ui/link-native-libs/suggest-libname-only-1.rs
diff --git a/tests/ui/native-library-link-flags/suggest-libname-only-1.stderr b/tests/ui/link-native-libs/suggest-libname-only-1.stderr
index e142835a9d6..e142835a9d6 100644
--- a/tests/ui/native-library-link-flags/suggest-libname-only-1.stderr
+++ b/tests/ui/link-native-libs/suggest-libname-only-1.stderr
diff --git a/tests/ui/native-library-link-flags/suggest-libname-only-2.rs b/tests/ui/link-native-libs/suggest-libname-only-2.rs
index 7ed106e4ab4..7ed106e4ab4 100644
--- a/tests/ui/native-library-link-flags/suggest-libname-only-2.rs
+++ b/tests/ui/link-native-libs/suggest-libname-only-2.rs
diff --git a/tests/ui/native-library-link-flags/suggest-libname-only-2.stderr b/tests/ui/link-native-libs/suggest-libname-only-2.stderr
index 392d2f01f61..392d2f01f61 100644
--- a/tests/ui/native-library-link-flags/suggest-libname-only-2.stderr
+++ b/tests/ui/link-native-libs/suggest-libname-only-2.stderr
diff --git a/tests/ui/linkage-attr/uikit-framework.rs b/tests/ui/link-native-libs/uikit-framework.rs
index fca0332384a..fca0332384a 100644
--- a/tests/ui/linkage-attr/uikit-framework.rs
+++ b/tests/ui/link-native-libs/uikit-framework.rs