Skip to content

Rollup of 7 pull requests - #162592

Merged
rust-bors[bot] merged 21 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-3q5U3Oo
Sep 10, 2026
Merged

Rollup of 7 pull requests#162592
rust-bors[bot] merged 21 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-3q5U3Oo

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

sjwang05 and others added 21 commits September 1, 2026 17:11
This makes their test environment consistent between runs inside the
cg_clif and rust repos.
A fatal error that doesn't actually abort is indistinguishable from a
regular error. And the only places where emit_almost_fatal is called,
the produced FatalError is ignored.
The explanation provided was wrong. Libc doesn't exist on Windows, so
naturally this failed on missing lib. I have no idea what shenanigans
link.exe does to make this pass, but surely it doesn't actually link
libc.
This avoids a delayed bug if compilation is aborted between checking
function ABIs and codegening all functions.
And remove the encoded metadata if there are any errors or delayed bugs
after encoding.
* fix(traits): Remove expression references from index suggestions
* Use expression spans for index reference removal suggestions
* refactor(trait-selection): Simplify dereference suggestion guard
…bjorn3

Subtree sync for rustc_codegen_cranelift

Preparation for moving from git-subtree for josh-sync.

r? @ghost

@rustbot label +A-codegen +A-cranelift +T-compiler +subtree-sync
re-equate the object bound's trait ref with the goal's when considering object bounds

rust-lang/trait-system-refactor-initiative#295 bisects to rust-lang#152859, which changed `probe_and_consider_object_bound_candidate` to pass the trait object's trait ref in a binder to `predicates_for_object_candidate`, which calls `instantiate_binder_with_infer` on the binder.

Re-instantiating the binder like this, however, loses the constraint that `'x: 'static`, even though earlier in `match_assumption` we actually did equate the object trait ref with the goal's trait ref, which gave us the `eq('x, 'static)` relationship we needed. However, the new inference var has no relationship with the equality we established; hence we lose `'x: 'static` and therefore `Self: 'static` and `'s: 'static`.

We therefore inline `match_assumption` and directly equate the assumption's trait ref with the goal's before passing the assumption to `predicates_for_object_candidate` instead and remove the re-instantiation.

fixes rust-lang/trait-system-refactor-initiative#295

cc @lcnr
Some cleanups around fatal errors and delayed bugs

With the aim of making it easier to move some compiler passes to different locations. And in particular to allow moving them across `has_errors_or_delayed_bugs` calls. This is a prerequisite for a local change that improves the effectiveness of cargo build pipelining.

Fixes rust-lang#152204
…ng_index, r=jieyouxu

fix(traits): Remove expression references from index suggestions

Fix issue: rust-lang#162419
… r=oli-obk

Fix run-make/prune-link-args to work with MinGW

The explanation provided was wrong. Libc doesn't exist on Windows, so naturally this failed on missing lib. I have no idea what shenanigans link.exe does to make this pass, but surely it doesn't actually link libc.
…ieyouxu,Kobzol

Attemped fix for home dir problem on `dist-aarch64-llvm-mingw`

This is a fix for this spurious failure, which seems to regularly happen lately
rust-lang#162550 (comment)

disclaimer: I have no clue what is causing this and that I'm just attacking the symptoms. Seems like some kind of github runner misconfiguration?

The PR is being discussed here: [#t-infra > Tree ops @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Tree.20ops/near/622969695)
…=Darksonn

doc: Fix external mention of signum() return value regarding NaNs

`is_sign_positive()`/`is_sign_negative()` documentation refer to using `signum() ` but misrepresent the return value of the latter; `signum()` returns a float so it cannot be `false`; `signum()` documentation documents it as returning a NaN in this case, so propagated that to these references.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Sep 10, 2026
@rustbot rustbot added A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Sep 10, 2026
@rustbot rustbot added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Sep 10, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5

@rust-bors

rust-bors Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fbfe562 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Sep 10, 2026
@rust-bors

This comment has been minimized.

@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors treeopen
Seems fixed

@rust-bors

rust-bors Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

Tree is now open for merging.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 10, 2026
@rust-bors

rust-bors Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 17m 35s
Pushing 018018e to main...

@rust-bors
rust-bors Bot merged commit 018018e into rust-lang:main Sep 10, 2026
14 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Sep 10, 2026
@rust-bors

rust-bors Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#162581 Subtree sync for rustc_codegen_cranelift ❌ build failed
#160831 re-equate the object bound's trait ref with the goal's when… ❌ build failed
#162057 Some cleanups around fatal errors and delayed bugs ❌ build failed
#162437 fix(traits): Remove expression references from index sugges… ❌ build failed
#162534 Fix run-make/prune-link-args to work with MinGW ❌ build failed
#162554 Attemped fix for home dir problem on `dist-aarch64-llvm-min… ❌ build failed
#162576 doc: Fix external mention of signum() return value regardin… ❌ build failed

parent commit: c4c4a57693

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

Copy link
Copy Markdown
Contributor
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 c4c4a57 (parent) -> 018018e (this PR)

Test differences

Show 39 test diffs

Stage 1

  • [ui] tests/ui/abi/no_delayed_bug.rs: [missing] -> pass (J1)
  • [ui] tests/ui/suggestions/suggest-remove-reference-index.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/assoc-type-static-lifetime-object-bound.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/gat-static-in-trait-object.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/next-solver/supertrait-static-lifetime-object-bound.rs: [missing] -> pass (J1)
  • [crashes] tests/crashes/152204.rs: pass -> [missing] (J2)
  • [ui (polonius)] tests/ui/abi/no_delayed_bug.rs: [missing] -> pass (J3)
  • [ui (polonius)] tests/ui/suggestions/suggest-remove-reference-index.rs: [missing] -> pass (J3)
  • [ui (polonius)] tests/ui/traits/next-solver/assoc-type-static-lifetime-object-bound.rs: [missing] -> pass (J3)
  • [ui (polonius)] tests/ui/traits/next-solver/gat-static-in-trait-object.rs: [missing] -> pass (J3)
  • [ui (polonius)] tests/ui/traits/next-solver/supertrait-static-lifetime-object-bound.rs: [missing] -> pass (J3)

Stage 2

  • [ui] tests/ui/abi/no_delayed_bug.rs: [missing] -> pass (J0)
  • [ui] tests/ui/suggestions/suggest-remove-reference-index.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/assoc-type-static-lifetime-object-bound.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/gat-static-in-trait-object.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/supertrait-static-lifetime-object-bound.rs: [missing] -> pass (J0)
  • [crashes] tests/crashes/152204.rs: pass -> [missing] (J4)
  • [run-make] tests/run-make/prune-link-args: ignore (ignored when the operating system and target environment are windows-gnu) -> pass (J5)

Additionally, 21 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 018018e881e2db0956f229dbb543e21f058d1ce7 --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

  1. test-x86_64-gnu-llvm-21: -> 51m 4s (+inf%)
  2. test-x86_64-gnu-llvm-22-1: 50m 14s -> 1h 16m (+52.9%)
  3. test-x86_64-gnu: 1h 53m -> 2h 36m (+38.5%)
  4. test-x86_64-gnu-nopt: 1h 50m -> 2h 31m (+37.8%)
  5. test-x86_64-gnu-stable: 1h 51m -> 2h 28m (+32.8%)
  6. test-x86_64-gnu-debug: 1h 39m -> 2h 11m (+32.3%)
  7. dist-x86_64-freebsd: 1h 8m -> 1h 29m (+31.1%)
  8. dist-armv7-linux: 1h 15m -> 1h 38m (+29.9%)
  9. dist-x86_64-musl: 1h 49m -> 2h 21m (+29.2%)
  10. dist-ohos-aarch64: 1h 1m -> 1h 19m (+28.4%)
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

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (018018e): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary -0.8%, secondary -3.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
0.6% [0.6%, 0.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.1% [-2.9%, -0.5%] 4
Improvements ✅
(secondary)
-3.7% [-3.7%, -3.7%] 1
All ❌✅ (primary) -0.8% [-2.9%, 0.6%] 5

Cycles

Results (primary -0.1%, secondary 3.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
0.6% [0.4%, 1.0%] 3
Regressions ❌
(secondary)
3.2% [3.2%, 3.2%] 1
Improvements ✅
(primary)
-0.6% [-1.0%, -0.4%] 4
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.1% [-1.0%, 1.0%] 7

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 480.118s -> 479.823s (-0.06%)
Artifact size: 403.78 MiB -> 403.70 MiB (-0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants