From f35f8414aafcc033fa706cda31062a0aaf933176 Mon Sep 17 00:00:00 2001 From: Tobias Bucher Date: Sat, 21 Dec 2024 11:08:22 +0100 Subject: Format `build.toml` consistently in platform support docs --- src/doc/rustc/src/platform-support/arm64e-apple-darwin.md | 2 +- src/doc/rustc/src/platform-support/arm64e-apple-ios.md | 2 +- src/doc/rustc/src/platform-support/arm64e-apple-tvos.md | 2 +- src/doc/rustc/src/platform-support/arm64ec-pc-windows-msvc.md | 2 +- src/doc/rustc/src/platform-support/hexagon-unknown-linux-musl.md | 2 +- src/doc/rustc/src/platform-support/unikraft-linux-musl.md | 2 +- src/doc/rustc/src/platform-support/win7-windows-msvc.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/doc/rustc/src/platform-support/arm64e-apple-darwin.md b/src/doc/rustc/src/platform-support/arm64e-apple-darwin.md index 4d98b3a6098..322a07c5739 100644 --- a/src/doc/rustc/src/platform-support/arm64e-apple-darwin.md +++ b/src/doc/rustc/src/platform-support/arm64e-apple-darwin.md @@ -20,7 +20,7 @@ You can build Rust with support for the targets by adding it to the `target` lis ```toml [build] -target = [ "arm64e-apple-darwin" ] +target = ["arm64e-apple-darwin"] ``` ## Building Rust programs diff --git a/src/doc/rustc/src/platform-support/arm64e-apple-ios.md b/src/doc/rustc/src/platform-support/arm64e-apple-ios.md index fc4ec5e373f..3d8ba5c282a 100644 --- a/src/doc/rustc/src/platform-support/arm64e-apple-ios.md +++ b/src/doc/rustc/src/platform-support/arm64e-apple-ios.md @@ -18,7 +18,7 @@ You can build Rust with support for the targets by adding it to the `target` lis ```toml [build] -target = [ "arm64e-apple-ios" ] +target = ["arm64e-apple-ios"] ``` ## Building Rust programs diff --git a/src/doc/rustc/src/platform-support/arm64e-apple-tvos.md b/src/doc/rustc/src/platform-support/arm64e-apple-tvos.md index 47234809e5f..ec8a996549e 100644 --- a/src/doc/rustc/src/platform-support/arm64e-apple-tvos.md +++ b/src/doc/rustc/src/platform-support/arm64e-apple-tvos.md @@ -19,7 +19,7 @@ You can build Rust with support for the targets by adding it to the `target` lis ```toml [build] -target = [ "arm64e-apple-tvos" ] +target = ["arm64e-apple-tvos"] ``` ## Building Rust programs diff --git a/src/doc/rustc/src/platform-support/arm64ec-pc-windows-msvc.md b/src/doc/rustc/src/platform-support/arm64ec-pc-windows-msvc.md index dcabd21a83e..15bf55d35a2 100644 --- a/src/doc/rustc/src/platform-support/arm64ec-pc-windows-msvc.md +++ b/src/doc/rustc/src/platform-support/arm64ec-pc-windows-msvc.md @@ -60,7 +60,7 @@ list in `config.toml`: ```toml [build] -target = [ "arm64ec-pc-windows-msvc" ] +target = ["arm64ec-pc-windows-msvc"] ``` ## Building Rust programs diff --git a/src/doc/rustc/src/platform-support/hexagon-unknown-linux-musl.md b/src/doc/rustc/src/platform-support/hexagon-unknown-linux-musl.md index c1372726a35..d858337a949 100644 --- a/src/doc/rustc/src/platform-support/hexagon-unknown-linux-musl.md +++ b/src/doc/rustc/src/platform-support/hexagon-unknown-linux-musl.md @@ -48,7 +48,7 @@ target list in `config.toml`, a sample configuration is shown below. ```toml [build] -target = [ "hexagon-unknown-linux-musl"] +target = ["hexagon-unknown-linux-musl"] [target.hexagon-unknown-linux-musl] diff --git a/src/doc/rustc/src/platform-support/unikraft-linux-musl.md b/src/doc/rustc/src/platform-support/unikraft-linux-musl.md index 90fa18b9857..c589208c099 100644 --- a/src/doc/rustc/src/platform-support/unikraft-linux-musl.md +++ b/src/doc/rustc/src/platform-support/unikraft-linux-musl.md @@ -39,7 +39,7 @@ You can build Rust with support for the targets by adding it to the `target` lis ```toml [build] build-stage = 1 -target = [ "x86_64-unikraft-linux-musl" ] +target = ["x86_64-unikraft-linux-musl"] ``` ## Building Rust programs diff --git a/src/doc/rustc/src/platform-support/win7-windows-msvc.md b/src/doc/rustc/src/platform-support/win7-windows-msvc.md index 96613fb9be4..45b00a2be82 100644 --- a/src/doc/rustc/src/platform-support/win7-windows-msvc.md +++ b/src/doc/rustc/src/platform-support/win7-windows-msvc.md @@ -25,7 +25,7 @@ You can build Rust with support for the targets by adding it to the target list ```toml [build] build-stage = 1 -target = [ "x86_64-win7-windows-msvc" ] +target = ["x86_64-win7-windows-msvc"] ``` ## Building Rust programs -- cgit 1.4.1-3-g733a5 From ea75d051c633fe04820e4122255d7bb7b6c47598 Mon Sep 17 00:00:00 2001 From: Tobias Bucher Date: Sat, 21 Dec 2024 11:08:42 +0100 Subject: Fix compiler team name in target tier docs --- src/doc/rustc/src/target-tier-policy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/doc/rustc/src/target-tier-policy.md b/src/doc/rustc/src/target-tier-policy.md index e9cf2a0d1ae..bdcf2c0b07e 100644 --- a/src/doc/rustc/src/target-tier-policy.md +++ b/src/doc/rustc/src/target-tier-policy.md @@ -119,7 +119,7 @@ To propose addition of a new target, open a pull request on [`rust-lang/rust`]: Link to the created description page. - Ensure the pull request is assigned to a member of the [Rust compiler team][rust_compiler_team] by commenting: ```text - r? compiler-team + r? compiler ``` [tier3example]: https://github.com/rust-lang/rust/pull/94872 -- cgit 1.4.1-3-g733a5 From 7d5ff8b8bd5b1bf4721fd9a3e34b2e90e670be09 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 30 Dec 2024 11:25:00 +0000 Subject: Windows: Enable issue 70093 link tests --- src/tools/tidy/src/issues.txt | 2 -- .../issue-70093/issue-70093-link-directives.rs | 10 ---------- tests/ui/link-native-libs/issue-70093/issue-70093.rs | 10 ---------- .../link-native-libs/issue-70093/link-directives.rs | 9 +++++++++ .../issue-70093/link-native-libraries.rs | 20 ++++++++++++++++++++ 5 files changed, 29 insertions(+), 22 deletions(-) delete mode 100644 tests/ui/link-native-libs/issue-70093/issue-70093-link-directives.rs delete mode 100644 tests/ui/link-native-libs/issue-70093/issue-70093.rs create mode 100644 tests/ui/link-native-libs/issue-70093/link-directives.rs create mode 100644 tests/ui/link-native-libs/issue-70093/link-native-libraries.rs (limited to 'src') diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt index 25cd32063aa..54de2ef8314 100644 --- a/src/tools/tidy/src/issues.txt +++ b/src/tools/tidy/src/issues.txt @@ -2710,8 +2710,6 @@ 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 diff --git a/tests/ui/link-native-libs/issue-70093/issue-70093-link-directives.rs b/tests/ui/link-native-libs/issue-70093/issue-70093-link-directives.rs deleted file mode 100644 index 9c60affbccd..00000000000 --- a/tests/ui/link-native-libs/issue-70093/issue-70093-link-directives.rs +++ /dev/null @@ -1,10 +0,0 @@ -//@ run-pass -//@ compile-flags: -Zlink-directives=no -//@ ignore-windows - this will probably only work on unixish systems -//@ ignore-fuchsia - missing __libc_start_main for some reason (#84733) -//@ ignore-cross-compile - default-linker-libraries=yes doesn't play well with cross compiling - -#[link(name = "some-random-non-existent-library", kind = "static")] -extern "C" {} - -fn main() {} diff --git a/tests/ui/link-native-libs/issue-70093/issue-70093.rs b/tests/ui/link-native-libs/issue-70093/issue-70093.rs deleted file mode 100644 index 86974239338..00000000000 --- a/tests/ui/link-native-libs/issue-70093/issue-70093.rs +++ /dev/null @@ -1,10 +0,0 @@ -//@ run-pass -//@ compile-flags: -Zlink-native-libraries=no -Cdefault-linker-libraries=yes -//@ ignore-windows - this will probably only work on unixish systems -//@ ignore-fuchsia - missing __libc_start_main for some reason (#84733) -//@ ignore-cross-compile - default-linker-libraries=yes doesn't play well with cross compiling - -#[link(name = "some-random-non-existent-library", kind = "static")] -extern "C" {} - -fn main() {} diff --git a/tests/ui/link-native-libs/issue-70093/link-directives.rs b/tests/ui/link-native-libs/issue-70093/link-directives.rs new file mode 100644 index 00000000000..c67536d39e7 --- /dev/null +++ b/tests/ui/link-native-libs/issue-70093/link-directives.rs @@ -0,0 +1,9 @@ +//@ run-pass +//@ compile-flags: -Zlink-directives=no +//@ ignore-fuchsia - missing __libc_start_main for some reason (#84733) +//@ ignore-cross-compile - default-linker-libraries=yes doesn't play well with cross compiling + +#[link(name = "some-random-non-existent-library", kind = "static")] +extern "C" {} + +fn main() {} diff --git a/tests/ui/link-native-libs/issue-70093/link-native-libraries.rs b/tests/ui/link-native-libs/issue-70093/link-native-libraries.rs new file mode 100644 index 00000000000..3e14e33ba39 --- /dev/null +++ b/tests/ui/link-native-libs/issue-70093/link-native-libraries.rs @@ -0,0 +1,20 @@ +//@ run-pass +//@ compile-flags: -Zlink-native-libraries=no -Cdefault-linker-libraries=yes +//@ ignore-fuchsia - missing __libc_start_main for some reason (#84733) +//@ ignore-cross-compile - default-linker-libraries=yes doesn't play well with cross compiling + +//@ revisions: other +//@[other] ignore-msvc + +//@ revisions: msvc +// On Windows MSVC, default-linker-libraries=yes doesn't work because +// rustc drives the linker directly instead of going through another compiler. +// Therefore rustc would need to implement default-linker-libraries itself but doesn't. +// So instead we use -Clink-arg to directly set the required msvcrt.lib as a link arg. +//@[msvc] compile-flags: -Clink-arg=msvcrt.lib +//@[msvc] only-msvc + +#[link(name = "some-random-non-existent-library", kind = "static")] +extern "C" {} + +fn main() {} -- cgit 1.4.1-3-g733a5