Skip to content

Conversation

@Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Oct 28, 2025

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tshepang and others added 30 commits September 8, 2025 06:12
One can use unstable features on stable too, like via an env var
This updates the rust-version file to 4068baf.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 4068baf
Filtered ref: da574cbe2d3bcda451b7508b65e82de837b9c92d
Upstream diff: rust-lang/rust@4fa824b...4068baf

This merge was created using https://github.com/rust-lang/josh-sync.
the previous command already builds using in-tree std
I had a test I was confused by; the root issue is that `error-pattern`
runs before normalization, even though `//~ ERROR` runs after
normalization. This logging caught the issue immediately.
Add the gpu version of the kernel which was missing in the docs
To avoid linker errors like

    relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against `.data.rel.ro..L.hwasan'

we need to have `-C target-feature=+tagged-globals`, which is documented here:
https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html#hwaddresssanitizer
I accidentally commited some things with my name/email swapped ^^'
The LoongArch C/C++ cross toolchain defaults to the `normal` code model, which
can cause relocation overflows when linking LLVM after upgrading to verion 22.
This change uses the `medium`code model for `loongarch64-linux-gnu` and
`loongarch64-linux-musl` builds to avoid these linking errors.
This updates the rust-version file to b1b464d.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: b1b464d
Filtered ref: f94cd4e7de0695f11c7f0bf0d33bb39ce736c581
Upstream diff: rust-lang/rust@4068baf...b1b464d

This merge was created using https://github.com/rust-lang/josh-sync.
- Fix 'the the' → 'the' in rustc_const_eval
- Fix 'wether' → 'whether' in compiletest
- Fix 'is is' → 'is' in rustc_ast_pretty (2 instances)

Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>
Co-authored-by: Kevin Reid <kpreid@switchb.org>
@rustbot rustbot added A-rustdoc-search Area: Rustdoc's search feature A-testsuite Area: The testsuite used to check the correctness of rustc PG-exploit-mitigations Project group: Exploit mitigations 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-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Oct 28, 2025
@Zalathar
Copy link
Contributor Author

Rollup of everything. Some of these PRs have not had a fair chance to run in CI.

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Oct 28, 2025

📌 Commit 21a1573 has been approved by Zalathar

It is now in the queue for this repository.

@bors 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 Oct 28, 2025
@bors
Copy link
Collaborator

bors commented Oct 28, 2025

⌛ Testing commit 21a1573 with merge c9537a9...

@bors
Copy link
Collaborator

bors commented Oct 28, 2025

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing c9537a9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 28, 2025
@bors bors merged commit c9537a9 into rust-lang:master Oct 28, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Oct 28, 2025
@Zalathar Zalathar deleted the rollup-2eriuc3 branch October 28, 2025 13:21
@github-actions
Copy link
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 df984ed (parent) -> c9537a9 (this PR)

Test differences

Show 312 test diffs

Stage 1

  • [coverage-map] tests/coverage/remap-path-prefix.rs#with_coverage_scope: [missing] -> pass (J2)
  • [coverage-map] tests/coverage/remap-path-prefix.rs#with_macro_scope: [missing] -> pass (J2)
  • [coverage-map] tests/coverage/remap-path-prefix.rs#with_object_scope: [missing] -> pass (J2)
  • [coverage-map] tests/coverage/remap-path-prefix.rs#with_remap: [missing] -> pass (J2)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_coverage_scope: [missing] -> ignore (ignored when the profiler runtime is not available) (J2)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_macro_scope: [missing] -> ignore (ignored when the profiler runtime is not available) (J2)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_object_scope: [missing] -> ignore (ignored when the profiler runtime is not available) (J2)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_remap: [missing] -> ignore (ignored when the profiler runtime is not available) (J2)
  • [rustdoc-js] tests/rustdoc-js/merged-doc.rs#merge: [missing] -> pass (J2)
  • [rustdoc-js] tests/rustdoc-js/merged-doc.rs#nomerge: [missing] -> pass (J2)
  • [ui] tests/ui/dst/dst-object-from-unsized-type.rs: pass -> [missing] (J2)
  • [ui] tests/ui/dst/dst-object-from-unsized-type.rs#current: [missing] -> pass (J2)
  • [ui] tests/ui/dst/dst-object-from-unsized-type.rs#next: [missing] -> pass (J2)
  • [ui] tests/ui/repr/repr-transparent-repr-c.rs: [missing] -> pass (J2)
  • [ui] tests/ui/sanitizer/cfi/fn-trait-objects.rs: [missing] -> pass (J2)
  • [ui] tests/ui/sanitizer/kcfi/fn-trait-objects.rs: [missing] -> pass (J2)
  • [ui] tests/ui/traits/next-solver/unsize-goal-mismatch-2.rs#current: [missing] -> pass (J2)
  • [ui] tests/ui/traits/next-solver/unsize-goal-mismatch-2.rs#next: [missing] -> pass (J2)
  • [ui] tests/ui/traits/next-solver/unsize-goal-mismatch.rs#current: [missing] -> pass (J2)
  • [ui] tests/ui/traits/next-solver/unsize-goal-mismatch.rs#next: [missing] -> pass (J2)
  • [ui] tests/ui/traits/next-solver/unsize-overflow.rs: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/dst/dst-object-from-unsized-type.rs: pass -> [missing] (J0)
  • [ui] tests/ui/dst/dst-object-from-unsized-type.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/dst/dst-object-from-unsized-type.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/repr/repr-transparent-repr-c.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/unsize-goal-mismatch-2.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/unsize-goal-mismatch-2.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/unsize-goal-mismatch.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/unsize-goal-mismatch.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/traits/next-solver/unsize-overflow.rs: [missing] -> pass (J0)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_coverage_scope: [missing] -> ignore (ignored when cross-compiling) (J1)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_macro_scope: [missing] -> ignore (ignored when cross-compiling) (J1)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_object_scope: [missing] -> ignore (ignored when cross-compiling) (J1)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_remap: [missing] -> ignore (ignored when cross-compiling) (J1)
  • [ui] tests/ui/sanitizer/kcfi/fn-trait-objects.rs: [missing] -> ignore (ignored on targets without kernel CFI sanitizer) (J3)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_coverage_scope: [missing] -> pass (J4)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_macro_scope: [missing] -> pass (J4)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_object_scope: [missing] -> pass (J4)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_remap: [missing] -> pass (J4)
  • [debuginfo-cdb] tests/debuginfo/macro-stepping.rs: ignore (ignored when the architecture is aarch64) -> pass (J5)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_coverage_scope: [missing] -> ignore (ignored when the profiler runtime is not available) (J6)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_macro_scope: [missing] -> ignore (ignored when the profiler runtime is not available) (J6)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_object_scope: [missing] -> ignore (ignored when the profiler runtime is not available) (J6)
  • [coverage-run] tests/coverage/remap-path-prefix.rs#with_remap: [missing] -> ignore (ignored when the profiler runtime is not available) (J6)
  • [ui] tests/ui/sanitizer/cfi/fn-trait-objects.rs: [missing] -> ignore (only executed when the operating system is linux) (J7)
  • [ui] tests/ui/sanitizer/kcfi/fn-trait-objects.rs: [missing] -> ignore (only executed when the operating system is linux) (J7)
  • [coverage-map] tests/coverage/remap-path-prefix.rs#with_coverage_scope: [missing] -> pass (J8)
  • [coverage-map] tests/coverage/remap-path-prefix.rs#with_macro_scope: [missing] -> pass (J8)
  • [coverage-map] tests/coverage/remap-path-prefix.rs#with_object_scope: [missing] -> pass (J8)
  • [coverage-map] tests/coverage/remap-path-prefix.rs#with_remap: [missing] -> pass (J8)
  • [ui] tests/ui/sanitizer/hwaddress.rs: ignore (ignored when the target is aarch64-unknown-linux-gnu) -> pass (J9)
  • [rustdoc-js] tests/rustdoc-js/merged-doc.rs#merge: [missing] -> pass (J10)
  • [rustdoc-js] tests/rustdoc-js/merged-doc.rs#nomerge: [missing] -> pass (J10)
  • [ui] tests/ui/sanitizer/cfi/fn-trait-objects.rs: [missing] -> ignore (gcc backend is marked as ignore) (J11)
  • [ui] tests/ui/sanitizer/kcfi/fn-trait-objects.rs: [missing] -> ignore (gcc backend is marked as ignore) (J11)
  • [debuginfo-gdb] tests/debuginfo/macro-stepping.rs: ignore (ignored when the architecture is aarch64) -> pass (J12)
  • [ui] tests/ui/sanitizer/cfi/fn-trait-objects.rs: [missing] -> ignore (ignored on targets without CFI sanitizer) (J13)
  • [ui] tests/ui/sanitizer/hwaddress.rs: ignore (ignored when the target is aarch64-unknown-linux-gnu) -> ignore (ignored on targets without sanitizers support) (J14)
  • [ui] tests/ui/sanitizer/kcfi/fn-trait-objects.rs: [missing] -> pass (J15)
  • [ui] tests/ui/sanitizer/cfi/fn-trait-objects.rs: [missing] -> pass (J16)

Additionally, 252 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 c9537a94a6300a8292804829801f7724fb8a33f6 --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. dist-loongarch64-linux: 5217.1s -> 11354.2s (117.6%)
  2. dist-loongarch64-musl: 5158.2s -> 10893.4s (111.2%)
  3. pr-check-1: 1438.0s -> 1890.9s (31.5%)
  4. dist-x86_64-msvc-alt: 12006.4s -> 9674.0s (-19.4%)
  5. test-various: 5948.5s -> 6806.4s (14.4%)
  6. x86_64-gnu-llvm-20-1: 3262.1s -> 3700.0s (13.4%)
  7. dist-armv7-linux: 5628.2s -> 4936.9s (-12.3%)
  8. dist-aarch64-apple: 7592.0s -> 6670.7s (-12.1%)
  9. x86_64-rust-for-linux: 2612.2s -> 2921.0s (11.8%)
  10. x86_64-gnu-llvm-20-2: 6075.0s -> 5415.8s (-10.9%)
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
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#144936 CFI: Fix types that implement Fn, FnMut, or FnOnce 06a1aa4a2ba76913a8acdfe4711a48ebb04af577 (link)
#147185 repr(transparent): do not consider repr(C) types to be 1-ZST c6dddf66900eb5424cb07fcd54949d628d07a619 (link)
#147840 Rework unsizing coercions in the new solver 006b54a85ed68b58bbac9994ddd906d61979858a (link)
#147915 Update target maintainers android.md 0f969124650f39a54bd1d290151ae8dd60f714c3 (link)
#148013 1.91.0 release notes 06034cbb8ee6cb25e05c85d0c5575ce1489fde17 (link)
#148044 compiletest: show output in debug logging f2bee3c526a63a53c2ef457d0c8f5b34bdc3fb30 (link)
#148057 tests/ui/sanitizer/hwaddress.rs: Run on aarch64 and remove … 46a48f5d27d69ea45739750f18306caf7db7d4b3 (link)
#148139 Add coverage scope for controlling paths in code coverage 950b05b5a293d5bd2d8aec4c1b96711ea155eb97 (link)
#148154 Add a mailmap entry b18a2298641febb8fd016e3ef763b4e81af4c4f0 (link)
#148158 ci: loongarch64: use medium code model to avoid relocation … fd7f9cb876e85377a90d86e874a810e82f003af7 (link)
#148166 Re-enable macro-stepping test for AArch64 7686ad1be5d0ece9638225806404a8c2ac074689 (link)
#148172 rustc-dev-guide subtree update aaaa0bae09f2bbb2eca9f0dd65f49cb6dde6430a (link)
#148175 Fix typos: duplicate words in comments c2ae3b15aaf86946cc141b9fade5f59b5e3e2e75 (link)
#148186 rustdoc-search: add an integration test for CCI f69e80be8ca42d7b9d4d31274157998715859676 (link)

previous master: df984edf44

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c9537a9): comparison URL.

Overall result: ❌ regressions - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
1.7% [0.3%, 2.9%] 9
Regressions ❌
(secondary)
0.7% [0.2%, 1.6%] 10
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.7% [0.3%, 2.9%] 9

Max RSS (memory usage)

Results (primary 0.3%, secondary 0.6%)

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

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

Cycles

Results (primary 2.5%, secondary 2.9%)

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

mean range count
Regressions ❌
(primary)
2.5% [2.1%, 3.1%] 6
Regressions ❌
(secondary)
2.9% [2.9%, 2.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.5% [2.1%, 3.1%] 6

Binary size

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

Bootstrap: 474.956s -> 474.143s (-0.17%)
Artifact size: 390.61 MiB -> 390.63 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-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-search Area: Rustdoc's search feature A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. 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.