Skip to content

Rollup of 11 pull requests - #163419

Merged
rust-bors[bot] merged 46 commits into
rust-lang:mainfrom
jhpratt:rollup-GBSeJEM
Sep 28, 2026
Merged

rust-bors[bot] merged 46 commits into
rust-lang:mainfrom
jhpratt:rollup-GBSeJEM

Conversation

@jhpratt

@jhpratt jhpratt commented Sep 28, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

iAeternus and others added 30 commits August 25, 2026 09:25
Instead of hardcoding the container layout assuming that the local
patches are in /build, look for them next to the script.  This helps
downstream distros to run this script if their container layout is
different and they don't put the musl working dir in /build.

This might be an unexpected change for some dowstream distros that
were using this script from another directory,but arranged for the
patches to still be in `/build`
It's a cut down version of `rustc_errors::DiagInner` that avoids `Span`.
It exists because `Span` used to not impl `Send` and so couldn't be sent
from codegen threads to the main thread. But that's no longer true and
we can send `DiagInner`s directly now.
By just storing `lo` and `hi` instead.
This whole section of the code deals with constructing an alternative
layout, but large nesting makes the control flow seem more complex than
it actually is.
Constructing these error variants is basically free
Having the generic list span multiple lines is quite jarring, and imo
easy to confuse with the parameter list at a glance.
There are already way too many helpers to construct paths in this crate and this one is not very useful.
In all cases, the passed span was already the span of the ident.
Improves consistency, and hopefully clarifies the purpose of
previously-mysteriosly named methods like `univariant`.
Most of these cases were found by searching for uses of `DUMMY_NODE_ID`.
Also inline `lambda0` and `lambda1` since they're only used once and are trivial wrappers around `lambda`.
It is much more similar to the methods there than to the methods in `base.rs`.
`new_inputs` and `idents` are never read anywhere, several other `Vec`s are supposed to be `ThinVec`s instead.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Sep 28, 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-meta Area: Issues & PRs about the rust-lang/rust repository itself 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 28, 2026
@jhpratt

jhpratt commented Sep 28, 2026

Copy link
Copy Markdown
Member Author

@bors r+ p=5 force

@rust-bors

rust-bors Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

📌 Commit f53ebb9 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 Sep 28, 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 Sep 28, 2026
@rust-bors

rust-bors Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 5m 5s
Pushing 28b6e69 to main...

@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 2269776 (parent) -> 28b6e69 (this PR)

Test differences

Show 39 test diffs

Stage 1

  • [ui] tests/ui/imports/nested-module-typo-inaccessible-issue-131366.rs: [missing] -> pass (J1)
  • [ui] tests/ui/imports/nested-module-typo-issue-131366.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lint/unused/must-use-lock-guard-issue-162843.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/imports/nested-module-typo-inaccessible-issue-131366.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/imports/nested-module-typo-issue-131366.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/lint/unused/must-use-lock-guard-issue-162843.rs: [missing] -> pass (J2)
  • vec_deque::test_partial_eq_vecdeque_reverse: [missing] -> pass (J4)

Stage 2

  • [ui] tests/ui/imports/nested-module-typo-inaccessible-issue-131366.rs: [missing] -> pass (J0)
  • [ui] tests/ui/imports/nested-module-typo-issue-131366.rs: [missing] -> pass (J0)
  • [ui] tests/ui/lint/unused/must-use-lock-guard-issue-162843.rs: [missing] -> pass (J0)
  • vec_deque::test_partial_eq_vecdeque_reverse: [missing] -> pass (J3)

Additionally, 28 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 28b6e691688c15cef4c60d9044274e7b84397870 --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-i686-gnu-nopt-1: 1h 27m -> 2h 20m (+60.5%)
  2. test-x86_64-gnu: 1h 38m -> 2h 36m (+59.6%)
  3. test-x86_64-msvc-ext1: 1h 32m -> 2h 20m (+52.3%)
  4. dist-loongarch64-musl: 1h 23m -> 2h 4m (+49.7%)
  5. dist-x86_64-msvc: 2h 3m -> 3h 3m (+48.7%)
  6. test-i686-gnu-nopt-2: 2h 22m -> 1h 22m (-42.0%)
  7. dist-i686-linux: 1h 20m -> 1h 53m (+39.8%)
  8. test-aarch64-apple-macos-26-2: 1h 52m -> 2h 35m (+38.0%)
  9. test-x86_64-gnu-nopt: 1h 52m -> 2h 34m (+37.1%)
  10. test-x86_64-msvc-ext2: 1h 51m -> 1h 10m (-36.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
Copy Markdown
Collaborator

Finished benchmarking commit (28b6e69): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

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

Max RSS (memory usage)

Results (primary 1.8%, secondary -0.8%)

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

mean range count
Regressions ❌
(primary)
1.8% [1.7%, 2.0%] 2
Regressions ❌
(secondary)
2.0% [1.2%, 2.3%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.4% [-6.9%, -0.5%] 5
All ❌✅ (primary) 1.8% [1.7%, 2.0%] 2

Cycles

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

Binary size

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

Bootstrap: 489.806s -> 488.07s (-0.35%)
Artifact size: 406.32 MiB -> 406.39 MiB (0.02%)

@rust-bors

rust-bors Bot commented Sep 28, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#163085 Suggest similarly named modules in import paths 7566673afe9bb10977756c59a4d2350eb0557590
(link)
#163098 [debugger visualizers] Add workaround to read Rc strong/w… 3f3412708c47d18d950d9247642cf7d185d6c405
(link)
#163120 ci: make musl.sh look for patches next to the script bb1d35ff528702e7a2e4ee86eff864cfeb10f848
(link)
#163301 Fix unused_must_use for scenario which may need to keep val… 42b3b8369979c235ac13a3ade333f5d20efab5c9
(link)
#163307 Less SpanData in diagnostics 9ad9d62ed45e1cf74841e51583f1f5a2d2c01ff0
(link)
#163389 rustc_builtin_macros cleanup, part 7 6de1fe1e51f51eb9b1185976e9174aa43c3d8c5c
(link)
#152972 implement PartialEq<VecDeque> for Vec, &[T], &mut [T]… ff894268ceeeaa9e69e1f72e05f3798810efcc0a
(link)
#162536 Implement Default for NumBuffer 0e1b7e7b14455ea68021c7a4ceddc1751c51616a
(link)
#163141 Document safety requirements for intrinsic fallbacks bacfcfec1f757c234b4ea6b0a4ab9c5a956185a8
(link)
#163384 Various clean-ups around LayoutCalculator a08577f93f0c4b446e83f0558c0a53ebe4d58533
(link)
#163413 mailmap: add Matilde Morrone bef720f90e624ff0e617eb6d290475208917c263
(link)

parent commit: 22697761c6

In the case of a perf regression, run the following command with the SHAs of each PR you suspect might be the cause: @rust-timer triage $SHA $SHA $SHA..., or run @rust-timer triage all to benchmark all rollup members.

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-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.