Skip to content

Rollup of 4 pull requests - #160908

Merged
rust-bors[bot] merged 8 commits into
rust-lang:mainfrom
jhpratt:rollup-a7bBwHd
Aug 11, 2026
Merged

Rollup of 4 pull requests#160908
rust-bors[bot] merged 8 commits into
rust-lang:mainfrom
jhpratt:rollup-a7bBwHd

Conversation

@jhpratt

@jhpratt jhpratt commented Aug 11, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

im-lunex and others added 8 commits August 10, 2026 21:16
* add regression tests for the fn sig ice
* add issuelinks in on top of the tests
* regenerate stderr snapshots
For consistency with `{:?}` before it
The existing code takes a command-line argument (that might not even be a
path), glues it to the repository path, makes it absolute relative to the
working directory, then tries to strip the repository path off again.

That all seems needlessly complicated.

The new approach is much simpler: If an argument is an absolute path that
exists, try to strip the repository path from it, or otherwise change nothing.
That should hopefully give the same results in every useful case.
Add offload support to the dist-x86_64-linux CI job

Add offload support to the dist-x86_64-linux CI job
This enables users to compile offload code without building rustc from source

- Package the offload runtime shared libraries
- Package the AMDGPU and NVPTX device runtime libraries

I checked the tarballs work by compiling & running the sample offload code here:
https://rustc-dev-guide.rust-lang.org/offload/usage.html

| Before | After |
| --- | --- |
| <img width="511" height="246" alt="スクリーンショット 2026-07-16 23 46 46" src="https://github.com/user-attachments/assets/f05cbabe-d6d5-4d1a-ae49-45e8a8092d69" /> | <img width="503" height="360" alt="スクリーンショット 2026-07-16 23 49 32" src="https://github.com/user-attachments/assets/4f69e15d-231b-4a27-a719-29da42b46d70" /> |
| <img width="595" height="998" alt="スクリーンショット 2026-07-16 23 48 31" src="https://github.com/user-attachments/assets/5dbbe9d1-2c26-4002-8a8c-d15edc3ea4db" /> | <img width="594" height="986" alt="スクリーンショット 2026-07-16 23 50 27" src="https://github.com/user-attachments/assets/90575be6-4970-4038-8248-9b9dd6cbaef3" /> |

There are two changes affect outside of offload (I left github comments on the relevant sections). So,

r? @Kobzol
r? @jieyouxu
r? @ZuseZ4

closes: rust-lang#153203

* Continuous of rust-lang#153203
add regression tests for the fn sig ice

follow-up to rust-lang#160628 which fixed the `suggest_add_reference_to_arg` fn_sig ice

adds the regression tests @teor2345 asked for in review
- closure call with a missing-field struct literal (iced without the guard)
- method call whose where-clause fails (covers the method-call branch)

the impl def_id case cant be constructed, those obligations get dropped during probing and turn into e0599 instead
bootstrap: Simplify absolute path handling

The existing code takes a command-line argument (that might not even be a path), glues it to the repository path, makes it absolute relative to the working directory, then tries to strip the repository path off again.

That all seems needlessly complicated.

The new approach is much simpler: If an argument is an absolute path that exists, try to strip the repository path from it, or otherwise change nothing. That should hopefully give the same results in every useful case.

---

Relevant earlier PRs:
- rust-lang#126782
- rust-lang#146774

r? Kobzol (who last modified this code), or bootstrap
…yuVanilla

Put `{:#?}` into backticks

For consistency with `{:?}` before it
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 11, 2026
@rustbot rustbot added A-CI Area: Our Github Actions CI 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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 Aug 11, 2026
@jhpratt

jhpratt commented Aug 11, 2026

Copy link
Copy Markdown
Member Author

@bors r+ p=5

@rust-bors

rust-bors Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 7e9daa7 has been approved by jhpratt

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 Aug 11, 2026
@rust-bors

This comment has been minimized.

@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 Aug 11, 2026
@rust-bors

rust-bors Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 17m 11s
Pushing e64c8a6 to main...

@rust-bors
rust-bors Bot merged commit e64c8a6 into rust-lang:main Aug 11, 2026
14 checks passed
@rustbot rustbot added this to the 1.99.0 milestone Aug 11, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#159064 Add offload support to the dist-x86_64-linux CI job 9f857f810924380bb9704a3e979271b556d79f92 (link)
#160746 add regression tests for the fn sig ice 1be551893d1c2030938e56b9abae873139cc3f0f (link)
#160855 bootstrap: Simplify absolute path handling 43f7f87c4b097e24c5e5e347ec80a9ad0b532f33 (link)
#160898 Put {:#?} into backticks 33bb49d8a4fc5f23e4900846800a006364c2e854 (link)

previous master: a04c7a037d

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 a04c7a0 (parent) -> e64c8a6 (this PR)

Test differences

Show 8 test diffs

Stage 1

  • [ui] tests/ui/structs/ice-missing-field-fn-sig-closure.rs: [missing] -> pass (J1)
  • [ui] tests/ui/structs/ice-missing-field-fn-sig-method.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/structs/ice-missing-field-fn-sig-closure.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/structs/ice-missing-field-fn-sig-method.rs: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/structs/ice-missing-field-fn-sig-closure.rs: [missing] -> pass (J0)
  • [ui] tests/ui/structs/ice-missing-field-fn-sig-method.rs: [missing] -> pass (J0)

Additionally, 2 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 e64c8a664d9da54fc239cd4404cbf67f0d624326 --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. x86_64-gnu-stdlib-semver-check: 12m 11s -> 5m 41s (-53.3%)
  2. i686-gnu-nopt-1: 1h 24m -> 2h 6m (+49.3%)
  3. x86_64-gnu-debug: 2h 1m -> 1h 8m (-43.6%)
  4. x86_64-gnu-gcc-core-tests: 13m 56s -> 8m 24s (-39.6%)
  5. x86_64-gnu-llvm-21: 34m 30s -> 47m 27s (+37.5%)
  6. i686-gnu-nopt-2: 1h 40m -> 2h 16m (+36.7%)
  7. x86_64-rust-for-linux: 51m 35s -> 34m 9s (-33.8%)
  8. dist-ohos-armv7: 53m 49s -> 1h 11m (+33.1%)
  9. dist-x86_64-apple: 1h 57m -> 2h 32m (+30.1%)
  10. x86_64-gnu-llvm-22-2: 1h 35m -> 1h 7m (-29.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 (e64c8a6): 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 5.2%, secondary -0.3%)

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

mean range count
Regressions ❌
(primary)
5.2% [5.2%, 5.2%] 1
Regressions ❌
(secondary)
0.5% [0.4%, 0.6%] 7
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.4% [-4.1%, -2.6%] 2
All ❌✅ (primary) 5.2% [5.2%, 5.2%] 1

Cycles

Results (primary 2.4%, secondary 0.4%)

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

mean range count
Regressions ❌
(primary)
2.4% [2.1%, 2.7%] 2
Regressions ❌
(secondary)
0.8% [0.4%, 1.4%] 15
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.7% [-1.0%, -0.4%] 6
All ❌✅ (primary) 2.4% [2.1%, 2.7%] 2

Binary size

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

Bootstrap: 463.191s -> 455.693s (-1.62%)
Artifact size: 396.43 MiB -> 396.39 MiB (-0.01%)

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-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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants