Rollup of 8 pull requests #140245

matthiaskrgr · 2025-04-24T09:40:50Z

Successful merges:

mitigate MSVC alignment issue on x86-32 #139261 (mitigate MSVC alignment issue on x86-32)
Mention average in midpoint documentations #140075 (Mention average in midpoint documentations)
Update doc of cygwin target #140184 (Update doc of cygwin target)
Rename compute_x methods #140186 (Rename compute_x methods)
minicore: Have //@ add-core-stubs also imply -Cforce-unwind-tables=yes #140194 (minicore: Have //@ add-core-stubs also imply -Cforce-unwind-tables=yes)
triagebot: label minicore changes w/ A-test-infra-minicore and ping jieyouxu on changes #140195 (triagebot: label minicore changes w/ A-test-infra-minicore and ping jieyouxu on changes)
Remove comment about handling non-global where bounds with corresponding projection #140214 (Remove comment about handling non-global where bounds with corresponding projection)
Revert overzealous parse recovery for single colons in paths #140228 (Revert overzealous parse recovery for single colons in paths)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…32-msvc targets also mention the MSVC alignment issue in platform-support.md

To preserve CFI directives in assembly tests.

….rs`

…wind-tables=yes`

And ping jieyouxu on changes.

…oli-obk mitigate MSVC alignment issue on x86-32 This implements mitigation for rust-lang#112480 by stopping to emit `align` attributes on loads and function arguments when building for a win32 MSVC target. MSVC is known to not properly align `u64` and similar types, and claiming to LLVM that everything is properly aligned increases the chance that this will cause problems. Of course, the misalignment is still a bug, but we can't fix that bug, only MSVC can. Also add an errata note to the platform support page warning users about this known problem. try-job: `i686-msvc*`

Mention average in midpoint documentations Added a mention to "average" in midpoint documentations and as well as some `#[doc(alias = "average")]`[^1]. This is done to improve the discoverability of the function. [^1]: https://docs.rs/num-integer/latest/num_integer/trait.Average.html#tymethod.average_floor

…atrieb Update doc of cygwin target Some trivial updates.

…rrors Rename `compute_x` methods r? ```@lcnr``` I find the `compute_x` naming scheme to be overly confusing. It means `compute_wf_obligations_for_x_and_add_them_to_self` but shortens out all of the important parts of the actual operation being performed. `compute_x` sounds like its somehow performing `x`, maybe even returning it from the function, which is not true. I've had some newer contributors be confused by this naming scheme so I think it's good to change it to something more self-evident Some misc drive by niceties while I was here too.

…les, r=bjorn3 minicore: Have `//@ add-core-stubs` also imply `-Cforce-unwind-tables=yes` To preserve CFI directives in assembly tests, as `//@ add-core-stubs` already imply `-C panic=abort`. This is a blocker for rust-lang#140037 (comment). cc ```@RalfJung``` r? ```@bjorn3```

…youxu triagebot: label minicore changes w/ `A-test-infra-minicore` and ping jieyouxu on changes Just routine triagebot labelling/mentioning changes. r? ```@ghost```

Remove comment about handling non-global where bounds with corresponding projection This comment is no longer relevant since we only assemble rigid projections if no param-env candidates hold. Also remove a stray comment from the old solver. r? lcnr

…covery, r=jieyouxu Revert overzealous parse recovery for single colons in paths Basically manually reverts rust-lang#136808, cc ``@chenyukang`` ``@estebank.`` Reopens rust-lang#129273. Fixes [after beta backport] rust-lang#140227.

matthiaskrgr · 2025-04-24T09:41:13Z

@bors r+ rollup=never p=5

bors · 2025-04-24T09:41:15Z

📌 Commit f45d2bd has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-04-24T12:06:20Z

⌛ Testing commit f45d2bd with merge 3c877f6...

bors · 2025-04-24T15:17:01Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 3c877f6 to master...

rust-timer · 2025-04-24T15:19:32Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#139261	mitigate MSVC alignment issue on x86-32	`deeb64938778b7a017d901ea18424422d3e3da8b` (link)
#140075	Mention average in midpoint documentations	`35db07261ee8fee1bcdb352350980cb52c06796c` (link)
#140184	Update doc of cygwin target	`60565e7dc1fcdc3761388daa4bd60e78471fe585` (link)
#140186	Rename `compute_x` methods	`41db3962638c6ff880ba9ff076ad79fc57c862d4` (link)
#140194	minicore: Have `//@ add-core-stubs` also imply `-Cforce-unw…	`516bfa12a2a8d997f331adc6c815afff183ef4c6` (link)
#140195	triagebot: label minicore changes w/ `A-test-infra-minicore…	`887f1b4047044343207d2cbd91ded36c335921eb` (link)
#140214	Remove comment about handling non-global where bounds with …	`7a8cd6993f128d17d393a777a135aaf09342dafb` (link)
#140228	Revert overzealous parse recovery for single colons in paths	`1eb1f7b1cc98546e9aa07799053a611e8f9dd91b` (link)

previous master: dc8fe1f81c

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

github-actions · 2025-04-24T15:19:39Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing dc8fe1f (parent) -> 3c877f6 (this PR)

Test differences

Show 1182 test diffs

Stage 1

[ui] tests/ui/parser/ty-path-followed-by-single-colon.rs: [missing] -> pass (J0)
[ui] tests/ui/suggestions/argument-list-from-path-sep-error-129273.rs: pass -> [missing] (J0)

Stage 2

[ui] tests/ui/parser/ty-path-followed-by-single-colon.rs: [missing] -> pass (J1)
[ui] tests/ui/suggestions/argument-list-from-path-sep-error-129273.rs: pass -> [missing] (J1)
[codegen] tests/codegen/align-struct.rs: pass -> ignore (ignored when the target is i686-pc-windows-msvc) (J2)
[codegen] tests/codegen/issues/issue-56927.rs: pass -> ignore (ignored when the target is i686-pc-windows-msvc) (J2)

Additionally, 1176 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 3c877f6a477380ed61155d3bf816df09c9e05b9e --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

x86_64-apple-2: 4864.8s -> 6857.0s (41.0%)
dist-apple-various: 6709.7s -> 7675.3s (14.4%)
dist-x86_64-apple: 8490.9s -> 7461.6s (-12.1%)
aarch64-apple: 4822.6s -> 4245.2s (-12.0%)
dist-aarch64-apple: 4767.1s -> 5191.8s (8.9%)
mingw-check: 1337.4s -> 1243.5s (-7.0%)
dist-powerpc-linux: 5178.5s -> 5525.2s (6.7%)
x86_64-msvc-2: 6735.2s -> 7177.4s (6.6%)
x86_64-gnu-llvm-20-2: 6582.6s -> 6153.1s (-6.5%)
x86_64-gnu-aux: 5722.2s -> 6093.9s (6.5%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2025-04-24T16:46:34Z

Finished benchmarking commit (3c877f6): comparison URL.

Overall result: ✅ improvements - 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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.5%	[-0.5%, -0.5%]	2
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 0.0%, secondary 5.8%)

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)	0.7%	[0.7%, 0.7%]	1
Regressions ❌ (secondary)	5.8%	[5.8%, 5.8%]	1
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[-0.7%, 0.7%]	2

Cycles

Results (primary 0.5%)

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)	0.5%	[0.5%, 0.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.5%	[0.5%, 0.5%]	1

Binary size

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

Bootstrap: 777.711s -> 777.873s (0.02%)
Artifact size: 365.16 MiB -> 365.12 MiB (-0.01%)

RalfJung and others added 20 commits April 7, 2025 23:30

mitigate MSVC unsoundness by not emitting alignment attributes on win…

2678d04

…32-msvc targets also mention the MSVC alignment issue in platform-support.md

check_align: we can still check low alignments on MSVC

e702f96

Update doc of cygwin target

17664d1

Rename compute_x methods

0a76ef8

Module docs

c6e6ac9

compiletest: //@ add-core-stubs implies -Cforce-unwind-tables=yes

e3296cd

To preserve CFI directives in assembly tests.

tests: account for CFI directives in `tests/assembly/x86-return-float…

c79f156

….rs`

rustc-dev-guide: document that //@ add-core-stubs imply `-Cforce-un…

f2ab763

…wind-tables=yes`

triagebot: label minicore changes w/ A-test-infra-minicore

f0399b8

And ping jieyouxu on changes.

Remove hack

1162f42

Revert overzealous parse recovery for single colons

16da97b

Mention average in midpoint documentations

e88b289

Rollup merge of rust-lang#140184 - Berrysoft:cygwin-target-doc, r=Nor…

93c1e05

…atrieb Update doc of cygwin target Some trivial updates.

Rollup merge of rust-lang#140195 - jieyouxu:minicore-triagebot, r=jie…

984ef2c

…youxu triagebot: label minicore changes w/ `A-test-infra-minicore` and ping jieyouxu on changes Just routine triagebot labelling/mentioning changes. r? ```@ghost```

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 Apr 24, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 24, 2025

bors merged commit 3c877f6 into rust-lang:master Apr 24, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone Apr 24, 2025

bors mentioned this pull request Apr 24, 2025

[DO NOT MERGE] bootstrap with -Znext-solver=globally #133502

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #140245

Rollup of 8 pull requests #140245

matthiaskrgr commented Apr 24, 2025

matthiaskrgr commented Apr 24, 2025

bors commented Apr 24, 2025

bors commented Apr 24, 2025

bors commented Apr 24, 2025

rust-timer commented Apr 24, 2025

github-actions bot commented Apr 24, 2025

Stage 1

Stage 2

rust-timer commented Apr 24, 2025

Rollup of 8 pull requests #140245

Rollup of 8 pull requests #140245

Conversation

matthiaskrgr commented Apr 24, 2025

matthiaskrgr commented Apr 24, 2025

bors commented Apr 24, 2025

bors commented Apr 24, 2025

bors commented Apr 24, 2025

rust-timer commented Apr 24, 2025

github-actions bot commented Apr 24, 2025

Test differences

Stage 1

Stage 2

Job duration changes

rust-timer commented Apr 24, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size