Rollup of 12 pull requests #138202

jhpratt · 2025-03-08T02:57:55Z

Successful merges:

Add verbatim linker to AIXLinker #137337 (Add verbatim linker to AIXLinker)
compiler: factor Windows x86-32 ABI impl into its own file #137363 (compiler: factor Windows x86-32 ABI impl into its own file)
Prevent rmake.rs from using unstable features, and fix 3 run-make tests that currently do #137537 (Prevent rmake.rs from using unstable features, and fix 3 run-make tests that currently do)
add a "future" edition #137606 (add a "future" edition)
Remove i586-pc-windows-msvc #137957 (Remove i586-pc-windows-msvc)
atomic: clarify that failing conditional RMW operations are not 'writes' #138000 (atomic: clarify that failing conditional RMW operations are not 'writes')
Add post-merge analysis CI workflow #138013 (Add post-merge analysis CI workflow)
rustdoc: Add attribute-related tests for rustdoc JSON. #138033 (rustdoc: Add attribute-related tests for rustdoc JSON.)
setTargetTriple now accepts Triple rather than string #138137 (setTargetTriple now accepts Triple rather than string)
Delay bug for negative auto trait rather than ICEing #138173 (Delay bug for negative auto trait rather than ICEing)
Allow anyone to relabel CI-spurious-* #138184 (Allow anyone to relabel CI-spurious-*)
remove clones #138187 (remove clones)

r? @ghost
@rustbot modify labels: rollup

It's hard to implement edition migrations without having a perma-unstable "future" edition to target.

See MCP 840. I left a specialized error message that should help users that hit this in the wild (for example, because they use it in their CI).

While it shares more than zero code with the SysV x86-32 ABI impl, there is no particular reason to organize wildly different ABIs using if-else in the same function.

This is already applied for rustc/std tools. This is needed to make `windows` crates avoid trying to depend on a generated `windows.0.xx.0.lib`.

For `broken-pipe-no-ice` until std `anonymous_pipe` stabilizes.

…eature

…ures

Add verbatim linker to AIXLinker This adds support for the "verbatim" native link modifier on AIX, will successfully pass the `native-link-modifier-verbatim-linker test case`

…pl, r=jieyouxu compiler: factor Windows x86-32 ABI impl into its own file While it shares more than zero code with the SysV x86-32 ABI impl, there is no particular reason to organize wildly different ABIs using if-else in the same function.

Prevent `rmake.rs` from using unstable features, and fix 3 run-make tests that currently do Addresses (mostly) rust-lang#137532. Follow-up to rust-lang#137373. ### Summary - Fix 3 run-make tests that currently use unstable features: 1. `tests/run-make/issue-107495-archive-permissions/rmake.rs` uses `#![feature(rustc_private)]` for `libc` on `unix`, but `run_make_support` already exports `libc`, so just use that. 2. `tests/run-make/cross-lang-lto/rmake.rs` uses `#![feature(path_file_prefix)]` for convenience, replaced with similar filename prefix logic. 3. `tests/run-make/broken-pipe-no-ice/rmake.rs` uses `#![feature(anonymous_pipe)]` for anonymous pipes. This is more complicated[^race-condition], and I decided to temporarily introduce a dependency on [`os_pipe`] before std's `anonymous_pipe` library feature is stabilized[^pipe-stab]. I left a FIXME tracked by rust-lang#137532 to make the switch once `anonymous_pipe` stabilizes and reaches beta. - Use `RUSTC_BOOTSTRAP=-1` when building `rmake.rs` to have the stage 0 rustc reject any unstable features used in `rmake.rs`. - The requirement that `rmake.rs` may not use any unstable features is now documented in rustc-dev-guide. - This PR does not impose `RUSTC_BOOTSTRAP=-1` when building `run-make-support`, but I suppose we could. r? `@Kobzol` try-job: x86_64-msvc-1 try-job: x86_64-mingw-1 [`os_pipe`]: https://github.com/oconnor663/os_pipe.rs [^race-condition]: We can't just try to spawn `rustc` and immediate close the stderr handle because of race condition, as there's no guarantee `rustc` will not try to print to stderr before the handle gets closed. [^pipe-stab]: In-progress stabilization PR over at rust-lang#135822.

…oss,ehuss add a "future" edition This idea has been discussed previously [on Zulip](https://rust-lang.zulipchat.com/#narrow/channel/213817-t-lang/topic/Continuous.20edition-like.20changes.3F/near/432559262) (though what I've implemented isn't exactly the "next"/"future" editions proposed in that message, just the "future" edition). I've found myself prototyping changes that involve edition migrations and wanting to target an upcoming edition for those migrations, but none exists. This should be permanently unstable and not removed.

Remove i586-pc-windows-msvc See [MCP 840](rust-lang/compiler-team#840). I left a specialized error message that should help users that hit this in the wild (for example, because they use it in their CI). ``` error: Error loading target specification: the `i586-pc-windows-msvc` target has been removed. Use the `i686-pc-windows-msvc` target instead. Windows 10 (the minimum required OS version) requires a CPU baseline of at least i686 so you can safely switch. Run `rustc --print target-list` for a list of built-in targets ``` ``@workingjubilee`` ``@calebzulawski`` fyi portable-simd uses this target in CI, if you wanna remove it already before this happens

atomic: clarify that failing conditional RMW operations are not 'writes' Fixes rust-lang#136669 r? ``@Amanieu`` Cc ``@rust-lang/opsem`` ``@chorman0773`` ``@gnzlbg`` ``@briansmith``

…arcoieni Add post-merge analysis CI workflow This PR adds a post-merge analysis workflow, which was discussed [here](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Reporting.20test.20suite.20statistics.20after.20merge). The workflow currently analyzes test suite results from bootstrap metrics. It downloads metrics for all known jobs in the parent and current (HEAD) commit, compares them and prints a truncated diff. It then posts this diff to the merged PR as a comment. Later I also want to add other statistics to the analysis, e.g. changes in CI/bootstrap step durations. It can be tested locally e.g. using this: ``` cargo run --release --manifest-path src/ci/citool/Cargo.toml post-merge-report 3cb0272 fd17dea ``` This uses a slightly older commit as a parent, to have more results in the diff (normally the diff won't be so large). CC `@jieyouxu` r? `@marcoieni`

…aDotInTheVoid rustdoc: Add attribute-related tests for rustdoc JSON. Add rustdoc JSON tests covering the use of the following attributes: - `#[non_exhaustive]` applied to enums, variants, and structs - `#[must_use]`, both with and without a message - `#[no_mangle]`, in both edition 2021 and 2024 (`#[unsafe(no_mangle)]`) flavors - `#[export_name]`, also in both edition 2021 and 2024 flavors Related to rust-lang#137645; this is a subset of the attributes that `cargo-semver-checks` relies on and tests in its own test suite or in the test suites of its components such as `trustfall-rustdoc-adapter`. Helps with rust-lang#81359 r? `@aDotInTheVoid`

setTargetTriple now accepts Triple rather than string llvm/llvm-project#129868 updated `setTargetTriple`

…e-impl, r=oli-obk Delay bug for negative auto trait rather than ICEing Fixes rust-lang#138149 r? oli-obk

…rious, r=compiler-errors Allow anyone to relabel `CI-spurious-*` As suggested by `@Noratrieb` in reference to me attempting to set this label in rust-lang#136780 (comment), allow unauthenticated users to relabel `CI-spurious-*`.

jhpratt · 2025-03-08T02:58:04Z

@bors r+ rollup=never p=5

bors · 2025-03-08T02:58:06Z

📌 Commit dad4c8b has been approved by jhpratt

It is now in the queue for this repository.

bors · 2025-03-08T03:19:37Z

⌛ Testing commit dad4c8b with merge 20f0108ada90e37c2350ad68fdc6afe56f51539d...

bors · 2025-03-08T06:23:57Z

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing 20f0108 to master...

rust-log-analyzer · 2025-03-08T06:24:28Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


gh pr comment ${HEAD_PR} -F output.log
shell: /usr/bin/bash -e {0}
##[endgroup]
fatal: ambiguous argument 'HEAD^1': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
##[error]Process completed with exit code 128.

rust-timer · 2025-03-08T06:27:25Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#137337	Add verbatim linker to AIXLinker	`236c1667c84f3047e2520356687a68e590d6ab84` (link)
#137363	compiler: factor Windows x86-32 ABI impl into its own file	`a44b63582b2db4251e13c0fdd0b307e2bf4ad7f1` (link)
#137537	Prevent `rmake.rs` from using unstable features, and fix 3 …	`7084f500801acb9d88363b83b8693fdc2892fb12` (link)
#137606	add a "future" edition	`c7b7409633e982428e00bd82ebb2c922d4f5e1a0` (link)
#137957	Remove i586-pc-windows-msvc	`9a5f2aad0c41604fdb9304e3e0f749f4251f28db` (link)
#138000	atomic: clarify that failing conditional RMW operations are…	`2b62e0a5a46b600876836169eb616eb61f6067cb` (link)
#138013	Add post-merge analysis CI workflow	`6ba58b093c8e44dc726d5bfd48e60f0903f178cd` (link)
#138033	rustdoc: Add attribute-related tests for rustdoc JSON.	`a7ef12b4e94535177fd01600bd26be6f7df06a2b` (link)
#138137	setTargetTriple now accepts Triple rather than string	`558ab23700c9ef3e2c30514e5cba657f54154d3b` (link)
#138173	Delay bug for negative auto trait rather than ICEing	`4d81d002dcb5deb791f34886ebc4fbc54689be69` (link)
#138184	Allow anyone to relabel `CI-spurious-*`	`c02fdb20dedca915e85e2fba8bdc5ef12f9ac98b` (link)
#138187	remove clones	`814b7d25bb31c6297749b2991acb5124a41aa4f1` (link)

previous master: f5a1ef7121

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

Kobzol · 2025-03-08T06:41:50Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


gh pr comment ${HEAD_PR} -F output.log
shell: /usr/bin/bash -e {0}
##[endgroup]
fatal: ambiguous argument 'HEAD^1': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
##[error]Process completed with exit code 128.

Excuse this log, the post-merge workflow will require some tuning.

jhpratt · 2025-03-08T06:43:17Z

I assumed it was a bug (and also that it was known) given the fact that everything did in fact succeed 🙂

Kobzol · 2025-03-08T07:05:24Z

It's a new workflow (merged in this rollup) that runs after merging, so the failure doesn't really affect anything (other than spamming).

rust-timer · 2025-03-08T07:41:42Z

Finished benchmarking commit (20f0108): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	0.4%	[0.4%, 0.4%]	1
Regressions ❌ (secondary)	0.4%	[0.4%, 0.4%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.4%	[0.4%, 0.4%]	1

Max RSS (memory usage)

Results (primary -0.0%, secondary -4.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	2.7%	[2.7%, 2.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.9%	[-1.3%, -0.4%]	3
Improvements ✅ (secondary)	-4.0%	[-5.1%, -2.2%]	3
All ❌✅ (primary)	-0.0%	[-1.3%, 2.7%]	4

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 766.525s -> 766.756s (0.03%)
Artifact size: 362.15 MiB -> 362.11 MiB (-0.01%)

Curtis D'Alves and others added 30 commits February 20, 2025 14:31

add verbatim linker to AIXLinker

917d2eb

span: add a "future" edition

d6bb98e

It's hard to implement edition migrations without having a perma-unstable "future" edition to target.

Remove i586-pc-windows-msvc

b5562c0

See MCP 840. I left a specialized error message that should help users that hit this in the wild (for example, because they use it in their CI).

atomic: clarify that failing conditional RMW operations are not 'writes'

1a5a453

rustdoc: Add attribute-related tests for rustdoc JSON.

e07d9a8

compiler: factor Windows x86-32 ABI impl into its own file

9d8ce72

While it shares more than zero code with the SysV x86-32 ABI impl, there is no particular reason to organize wildly different ABIs using if-else in the same function.

setTargetTriple now accepts Triple rather than string

4e4bed8

rename Triple to Target

8814679

Add post-merge analysis CI workflow

d5da6b7

Apply --cfg windows_raw_dylib for bootstrap tools too

ec3cde2

This is already applied for rustc/std tools. This is needed to make `windows` crates avoid trying to depend on a generated `windows.0.xx.0.lib`.

Prevent rmake.rs from using any nightly/unstable features

bd884d8

Fix issue-107495-archive-permissions to not rely on rustc_private

da57f14

Fix cross-lang-lto to not use path_file_prefix

9befcfd

Temporarily depend on os_pipe in run-make-support and re-export it

d47e5a3

For `broken-pipe-no-ice` until std `anonymous_pipe` stabilizes.

Fix broken-pipe-no-ice to not depend on unstable anonymous_pipe f…

224f287

…eature

Document that rmake.rs/run-make-support may not use unstable feat…

c9c572c

…ures

Delay bug for negative auto trait rather than ICEing

bbc80a8

Allow anyone to relabel CI-spurious-*

06eecca

remove clones

e0c2636

Rollup merge of rust-lang#137337 - dalvescb:master, r=petrochenkov

19b6743

Add verbatim linker to AIXLinker This adds support for the "verbatim" native link modifier on AIX, will successfully pass the `native-link-modifier-verbatim-linker test case`

Rollup merge of rust-lang#138000 - RalfJung:atomic-rmw, r=Amanieu

8cf86cd

atomic: clarify that failing conditional RMW operations are not 'writes' Fixes rust-lang#136669 r? ``@Amanieu`` Cc ``@rust-lang/opsem`` ``@chorman0773`` ``@gnzlbg`` ``@briansmith``

Rollup merge of rust-lang#138137 - ZequanWu:fix-triple, r=cuviper

b160477

setTargetTriple now accepts Triple rather than string llvm/llvm-project#129868 updated `setTargetTriple`

Rollup merge of rust-lang#138173 - compiler-errors:incoherent-negativ…

9aac24d

…e-impl, r=oli-obk Delay bug for negative auto trait rather than ICEing Fixes rust-lang#138149 r? oli-obk

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 8, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 8, 2025

bors merged commit 20f0108 into rust-lang:master Mar 8, 2025
7 checks passed

rustbot added this to the 1.87.0 milestone Mar 8, 2025

jhpratt deleted the rollup-kqrl5xn branch March 8, 2025 06:25

bors mentioned this pull request Mar 8, 2025

Add explicit_extern_abis Feature and Enforce Explicit ABIs #135340

Open

bors mentioned this pull request Mar 8, 2025

native_libs: More consistent native library search between rustc and linker #138170

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 12 pull requests #138202

Rollup of 12 pull requests #138202

jhpratt commented Mar 8, 2025

jhpratt commented Mar 8, 2025

bors commented Mar 8, 2025

bors commented Mar 8, 2025

bors commented Mar 8, 2025

rust-log-analyzer commented Mar 8, 2025

rust-timer commented Mar 8, 2025

Kobzol commented Mar 8, 2025

jhpratt commented Mar 8, 2025

Kobzol commented Mar 8, 2025

rust-timer commented Mar 8, 2025

Rollup of 12 pull requests #138202

Rollup of 12 pull requests #138202

Conversation

jhpratt commented Mar 8, 2025

jhpratt commented Mar 8, 2025

bors commented Mar 8, 2025

bors commented Mar 8, 2025

bors commented Mar 8, 2025

rust-log-analyzer commented Mar 8, 2025

rust-timer commented Mar 8, 2025

Kobzol commented Mar 8, 2025

jhpratt commented Mar 8, 2025

Kobzol commented Mar 8, 2025

rust-timer commented Mar 8, 2025

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size