Rollup merge of rust-lang#133996 - Zalathar:ui-link-native-libs, r=ji…

…eyouxu 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 rust-lang#133895. r? jieyouxu
workingjubilee · Dec 7, 2024 · 04a6f49 · 04a6f49
2 parents a7fa799 + 0a48b96
commit 04a6f49
Show file tree

Hide file tree

Showing 55 changed files with 6 additions and 6 deletions.
diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
@@ -2297,8 +2297,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
@@ -2547,8 +2545,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
@@ -2713,11 +2709,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
@@ -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/...iliary/link-cfg-works-transitive-dylib.rs → ...iliary/link-cfg-works-transitive-dylib.rs b/...iliary/link-cfg-works-transitive-dylib.rs → ...iliary/link-cfg-works-transitive-dylib.rs
diff --git a/...xiliary/link-cfg-works-transitive-rlib.rs → ...xiliary/link-cfg-works-transitive-rlib.rs b/...xiliary/link-cfg-works-transitive-rlib.rs → ...xiliary/link-cfg-works-transitive-rlib.rs
diff --git a/...native-library-link-flags/empty-kind-1.rs → tests/ui/link-native-libs/empty-kind-1.rs b/...native-library-link-flags/empty-kind-1.rs → tests/ui/link-native-libs/empty-kind-1.rs
diff --git a/...ve-library-link-flags/empty-kind-1.stderr → ...s/ui/link-native-libs/empty-kind-1.stderr b/...ve-library-link-flags/empty-kind-1.stderr → ...s/ui/link-native-libs/empty-kind-1.stderr
diff --git a/...native-library-link-flags/empty-kind-2.rs → tests/ui/link-native-libs/empty-kind-2.rs b/...native-library-link-flags/empty-kind-2.rs → tests/ui/link-native-libs/empty-kind-2.rs
diff --git a/...ve-library-link-flags/empty-kind-2.stderr → ...s/ui/link-native-libs/empty-kind-2.stderr b/...ve-library-link-flags/empty-kind-2.stderr → ...s/ui/link-native-libs/empty-kind-2.stderr
diff --git a/tests/ui/linkage-attr/issue-109144.rs → tests/ui/link-native-libs/issue-109144.rs b/tests/ui/linkage-attr/issue-109144.rs → tests/ui/link-native-libs/issue-109144.rs
diff --git a/tests/ui/linkage-attr/issue-109144.stderr → ...s/ui/link-native-libs/issue-109144.stderr b/tests/ui/linkage-attr/issue-109144.stderr → ...s/ui/link-native-libs/issue-109144.stderr
diff --git a/tests/ui/issues/issue-43925.rs → tests/ui/link-native-libs/issue-43925.rs b/tests/ui/issues/issue-43925.rs → tests/ui/link-native-libs/issue-43925.rs
diff --git a/tests/ui/issues/issue-43925.stderr → tests/ui/link-native-libs/issue-43925.stderr b/tests/ui/issues/issue-43925.stderr → tests/ui/link-native-libs/issue-43925.stderr
diff --git a/tests/ui/issues/issue-43926.rs → tests/ui/link-native-libs/issue-43926.rs b/tests/ui/issues/issue-43926.rs → tests/ui/link-native-libs/issue-43926.rs
diff --git a/tests/ui/issues/issue-43926.stderr → tests/ui/link-native-libs/issue-43926.stderr b/tests/ui/issues/issue-43926.stderr → tests/ui/link-native-libs/issue-43926.stderr
diff --git a/...ssue-70093/issue-70093-link-directives.rs → ...ssue-70093/issue-70093-link-directives.rs b/...ssue-70093/issue-70093-link-directives.rs → ...ssue-70093/issue-70093-link-directives.rs
diff --git a/tests/ui/issues/issue-70093/issue-70093.rs → ...nk-native-libs/issue-70093/issue-70093.rs b/tests/ui/issues/issue-70093/issue-70093.rs → ...nk-native-libs/issue-70093/issue-70093.rs
diff --git a/tests/ui/linkage-attr/kind-framework.rs → tests/ui/link-native-libs/kind-framework.rs b/tests/ui/linkage-attr/kind-framework.rs → tests/ui/link-native-libs/kind-framework.rs
diff --git a/tests/ui/linkage-attr/kind-framework.stderr → ...ui/link-native-libs/kind-framework.stderr b/tests/ui/linkage-attr/kind-framework.stderr → ...ui/link-native-libs/kind-framework.stderr
diff --git a/...tive-library-link-flags/link-arg-error.rs → tests/ui/link-native-libs/link-arg-error.rs b/...tive-library-link-flags/link-arg-error.rs → tests/ui/link-native-libs/link-arg-error.rs
diff --git a/...-library-link-flags/link-arg-error.stderr → ...ui/link-native-libs/link-arg-error.stderr b/...-library-link-flags/link-arg-error.stderr → ...ui/link-native-libs/link-arg-error.stderr
diff --git a/...ve-library-link-flags/link-arg-from-rs.rs → ...s/ui/link-native-libs/link-arg-from-rs.rs b/...ve-library-link-flags/link-arg-from-rs.rs → ...s/ui/link-native-libs/link-arg-from-rs.rs
diff --git a/...ibrary-link-flags/link-arg-from-rs.stderr → .../link-native-libs/link-arg-from-rs.stderr b/...ibrary-link-flags/link-arg-from-rs.stderr → .../link-native-libs/link-arg-from-rs.stderr
diff --git a/...inkage-attr/link-attr-validation-early.rs → ...native-libs/link-attr-validation-early.rs b/...inkage-attr/link-attr-validation-early.rs → ...native-libs/link-attr-validation-early.rs
diff --git a/...ge-attr/link-attr-validation-early.stderr → ...ve-libs/link-attr-validation-early.stderr b/...ge-attr/link-attr-validation-early.stderr → ...ve-libs/link-attr-validation-early.stderr
diff --git a/...linkage-attr/link-attr-validation-late.rs → ...-native-libs/link-attr-validation-late.rs b/...linkage-attr/link-attr-validation-late.rs → ...-native-libs/link-attr-validation-late.rs
diff --git a/...age-attr/link-attr-validation-late.stderr → ...ive-libs/link-attr-validation-late.stderr b/...age-attr/link-attr-validation-late.stderr → ...ive-libs/link-attr-validation-late.stderr
diff --git a/tests/ui/linkage-attr/link-cfg-works.rs → tests/ui/link-native-libs/link-cfg-works.rs b/tests/ui/linkage-attr/link-cfg-works.rs → tests/ui/link-native-libs/link-cfg-works.rs
diff --git a/tests/ui/manual/manual-link-bad-form.rs → .../link-native-libs/manual-link-bad-form.rs b/tests/ui/manual/manual-link-bad-form.rs → .../link-native-libs/manual-link-bad-form.rs
diff --git a/tests/ui/manual/manual-link-bad-form.stderr → ...k-native-libs/manual-link-bad-form.stderr b/tests/ui/manual/manual-link-bad-form.stderr → ...k-native-libs/manual-link-bad-form.stderr
diff --git a/tests/ui/manual/manual-link-bad-kind.rs → .../link-native-libs/manual-link-bad-kind.rs b/tests/ui/manual/manual-link-bad-kind.rs → .../link-native-libs/manual-link-bad-kind.rs
diff --git a/tests/ui/manual/manual-link-bad-kind.stderr → ...k-native-libs/manual-link-bad-kind.stderr b/tests/ui/manual/manual-link-bad-kind.stderr → ...k-native-libs/manual-link-bad-kind.stderr
diff --git a/.../ui/manual/manual-link-bad-search-path.rs → ...ative-libs/manual-link-bad-search-path.rs b/.../ui/manual/manual-link-bad-search-path.rs → ...ative-libs/manual-link-bad-search-path.rs
diff --git a/...manual/manual-link-bad-search-path.stderr → ...e-libs/manual-link-bad-search-path.stderr b/...manual/manual-link-bad-search-path.stderr → ...e-libs/manual-link-bad-search-path.stderr
diff --git a/tests/ui/manual/manual-link-framework.rs → ...link-native-libs/manual-link-framework.rs b/tests/ui/manual/manual-link-framework.rs → ...link-native-libs/manual-link-framework.rs
diff --git a/tests/ui/manual/manual-link-framework.stderr → ...-native-libs/manual-link-framework.stderr b/tests/ui/manual/manual-link-framework.stderr → ...-native-libs/manual-link-framework.stderr
diff --git a/...ui/manual/manual-link-unsupported-kind.rs → ...tive-libs/manual-link-unsupported-kind.rs b/...ui/manual/manual-link-unsupported-kind.rs → ...tive-libs/manual-link-unsupported-kind.rs
diff --git a/...anual/manual-link-unsupported-kind.stderr → ...-libs/manual-link-unsupported-kind.stderr b/...anual/manual-link-unsupported-kind.stderr → ...-libs/manual-link-unsupported-kind.stderr
diff --git a/...ary-link-flags/modifiers-bad.blank.stderr → ...nk-native-libs/modifiers-bad.blank.stderr b/...ary-link-flags/modifiers-bad.blank.stderr → ...nk-native-libs/modifiers-bad.blank.stderr
diff --git a/...link-flags/modifiers-bad.no-prefix.stderr → ...ative-libs/modifiers-bad.no-prefix.stderr b/...link-flags/modifiers-bad.no-prefix.stderr → ...ative-libs/modifiers-bad.no-prefix.stderr
diff --git a/...nk-flags/modifiers-bad.prefix-only.stderr → ...ive-libs/modifiers-bad.prefix-only.stderr b/...nk-flags/modifiers-bad.prefix-only.stderr → ...ive-libs/modifiers-bad.prefix-only.stderr
diff --git a/...ative-library-link-flags/modifiers-bad.rs → tests/ui/link-native-libs/modifiers-bad.rs b/...ative-library-link-flags/modifiers-bad.rs → tests/ui/link-native-libs/modifiers-bad.rs
diff --git a/...y-link-flags/modifiers-bad.unknown.stderr → ...-native-libs/modifiers-bad.unknown.stderr b/...y-link-flags/modifiers-bad.unknown.stderr → ...-native-libs/modifiers-bad.unknown.stderr
diff --git a/...ibrary-link-flags/modifiers-override-2.rs → .../link-native-libs/modifiers-override-2.rs b/...ibrary-link-flags/modifiers-override-2.rs → .../link-native-libs/modifiers-override-2.rs
diff --git a/...ry-link-flags/modifiers-override-2.stderr → ...k-native-libs/modifiers-override-2.stderr b/...ry-link-flags/modifiers-override-2.stderr → ...k-native-libs/modifiers-override-2.stderr
diff --git a/...ibrary-link-flags/modifiers-override-3.rs → .../link-native-libs/modifiers-override-3.rs b/...ibrary-link-flags/modifiers-override-3.rs → .../link-native-libs/modifiers-override-3.rs
diff --git a/...ry-link-flags/modifiers-override-3.stderr → ...k-native-libs/modifiers-override-3.stderr b/...ry-link-flags/modifiers-override-3.stderr → ...k-native-libs/modifiers-override-3.stderr
diff --git a/...-library-link-flags/modifiers-override.rs → ...ui/link-native-libs/modifiers-override.rs b/...-library-link-flags/modifiers-override.rs → ...ui/link-native-libs/modifiers-override.rs
diff --git a/...rary-link-flags/modifiers-override.stderr → ...ink-native-libs/modifiers-override.stderr b/...rary-link-flags/modifiers-override.stderr → ...ink-native-libs/modifiers-override.stderr
diff --git a/...ibrary-link-flags/msvc-non-utf8-output.rs → .../link-native-libs/msvc-non-utf8-output.rs b/...ibrary-link-flags/msvc-non-utf8-output.rs → .../link-native-libs/msvc-non-utf8-output.rs
diff --git a/...ry-link-flags/msvc-non-utf8-output.stderr → ...k-native-libs/msvc-non-utf8-output.stderr b/...ry-link-flags/msvc-non-utf8-output.stderr → ...k-native-libs/msvc-non-utf8-output.stderr
diff --git a/...rary-link-flags/suggest-libname-only-1.rs → ...ink-native-libs/suggest-libname-only-1.rs b/...rary-link-flags/suggest-libname-only-1.rs → ...ink-native-libs/suggest-libname-only-1.rs
diff --git a/...-link-flags/suggest-libname-only-1.stderr → ...native-libs/suggest-libname-only-1.stderr b/...-link-flags/suggest-libname-only-1.stderr → ...native-libs/suggest-libname-only-1.stderr
diff --git a/...rary-link-flags/suggest-libname-only-2.rs → ...ink-native-libs/suggest-libname-only-2.rs b/...rary-link-flags/suggest-libname-only-2.rs → ...ink-native-libs/suggest-libname-only-2.rs
diff --git a/...-link-flags/suggest-libname-only-2.stderr → ...native-libs/suggest-libname-only-2.stderr b/...-link-flags/suggest-libname-only-2.stderr → ...native-libs/suggest-libname-only-2.stderr
diff --git a/tests/ui/linkage-attr/uikit-framework.rs → tests/ui/link-native-libs/uikit-framework.rs b/tests/ui/linkage-attr/uikit-framework.rs → tests/ui/link-native-libs/uikit-framework.rs