Skip to content

Rollup of 5 pull requests#153865

Merged
rust-bors[bot] merged 11 commits intorust-lang:mainfrom
Zalathar:rollup-tKflfa5
Mar 14, 2026
Merged

Rollup of 5 pull requests#153865
rust-bors[bot] merged 11 commits intorust-lang:mainfrom
Zalathar:rollup-tKflfa5

Conversation

@Zalathar
Copy link
Member

Successful merges:

r? @ghost

Create a similar rollup

cyrgani and others added 11 commits March 13, 2026 10:00
The query's dep kind can be obtained from its vtable instead.

This commit also renames the `query_vtable` parameter to `query`, to be more
consistent with other functions that take a QueryVTable.
This helps to clarify that the field with type `ChunkSize` is a count of 1s,
not a length or size.
…=madsmtm

target specs: stricter checks for LLVM ABI values, and correlate that with cfg(target_abi)

This tightens the checks for `llvm_abiname`, `llvm_floatabi` and `rustc_abi` in our target specs. Those are the fields that actually control the ccABI. With this commit, we now have an allowlist of value for these fields for all architectures (we previously only had that for some architectures). We also check that `cfg(target_abi)` suitably correlates with the actual ccABI. I based this check on our in-tree targets. For all ccABIs where we had a bunch of "random" values that don't directly correlate to the ccABI (like "uwp"), I also allowed  `cfg(target_abi)`  to remain empty, and whenever it is allowed to be empty I also allowed arbitrary other values for JSON targets. However, there's still a risk that JSON targets will fail this new check -- the idea is that we'll then get bugreports and can adjust the check as needed.

I had to adjust the target specs for non-ARM32 Apple targets as those were all setting `llvm_floatabi`, which to my knowledge makes no sense -- LLVM only actually does anything with that field on ARM32. I also adjusted the target specs for MIPS32 targets: one of them was setting llvm_abiname, and then it seems safer and more consistent to set that for all targets, so I set it to "o32" everywhere which seems to be the default.

Cc @workingjubilee
Don't pass a separate `DepKind` to `query_feed`

This PR makes two small tweaks to the `query_feed` function, which is called by macro-generated methods on TyCtxtFeed:

- Don't pass `DepKind` as a separate argument, because it's already in the QueryVTable
- Rename `query_vtable` to `query`, to match other functions that take QueryVTable

r? nnethercote (or compiler)
relocate several ui tests

Remove `tests/ui/obsolete-in-place` and `tests/ui/operator-recovery`.
…ouxu

tests/debuginfo/basic-stepping.rs: Add cdb test

Takes us one step closer towards closing rust-lang#33013.
Use named fields in ChunkedBitSet's `Chunk::Mixed`

This helps to clarify that the field with type `ChunkSize` is a count of 1s, not a length or size.

There should be no change to compiler behaviour.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 14, 2026
@rustbot rustbot added O-apple Operating system: Apple / Darwin (macOS, iOS, tvOS, visionOS, watchOS) 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. labels Mar 14, 2026
@Zalathar
Copy link
Member Author

Rollup of everything.

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 14, 2026

📌 Commit 4f3a0ff has been approved by Zalathar

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 Mar 14, 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 Mar 14, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 14, 2026

☀️ Test successful - CI
Approved by: Zalathar
Duration: 3h 16m 42s
Pushing 798a011 to main...

@rust-bors rust-bors bot merged commit 798a011 into rust-lang:main Mar 14, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 14, 2026
@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 fd26499 (parent) -> 798a011 (this PR)

Test differences

Show 20 test diffs

Stage 1

  • [ui] tests/ui/binop/box-arithmetic-14915.rs: [missing] -> pass (J1)
  • [ui] tests/ui/binop/less-than-greater-than.rs: [missing] -> pass (J1)
  • [ui] tests/ui/binop/spaceship.rs: [missing] -> pass (J1)
  • [ui] tests/ui/obsolete-in-place/bad.rs: pass -> [missing] (J1)
  • [ui] tests/ui/operator-recovery/box-arithmetic-14915.rs: pass -> [missing] (J1)
  • [ui] tests/ui/operator-recovery/less-than-greater-than.rs: pass -> [missing] (J1)
  • [ui] tests/ui/operator-recovery/spaceship.rs: pass -> [missing] (J1)
  • [ui] tests/ui/parser/removed-syntax/removed-syntax-obsolete-in-place.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/binop/box-arithmetic-14915.rs: [missing] -> pass (J0)
  • [ui] tests/ui/binop/less-than-greater-than.rs: [missing] -> pass (J0)
  • [ui] tests/ui/binop/spaceship.rs: [missing] -> pass (J0)
  • [ui] tests/ui/obsolete-in-place/bad.rs: pass -> [missing] (J0)
  • [ui] tests/ui/operator-recovery/box-arithmetic-14915.rs: pass -> [missing] (J0)
  • [ui] tests/ui/operator-recovery/less-than-greater-than.rs: pass -> [missing] (J0)
  • [ui] tests/ui/operator-recovery/spaceship.rs: pass -> [missing] (J0)
  • [ui] tests/ui/parser/removed-syntax/removed-syntax-obsolete-in-place.rs: [missing] -> pass (J0)

Additionally, 4 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 798a011ace1c2b5be80767ba1d97a4dff0546f93 --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. aarch64-msvc-1: 1h 53m -> 2h 19m (+23.2%)
  2. pr-check-1: 27m 10s -> 32m 51s (+20.9%)
  3. dist-aarch64-apple: 1h 31m -> 1h 48m (+18.3%)
  4. tidy: 2m 27s -> 2m 52s (+16.8%)
  5. x86_64-gnu-miri: 1h 21m -> 1h 34m (+16.1%)
  6. i686-gnu-2: 1h 32m -> 1h 44m (+12.3%)
  7. x86_64-gnu-stable: 2h 18m -> 2h 34m (+11.5%)
  8. arm-android: 1h 37m -> 1h 47m (+10.9%)
  9. x86_64-gnu-tools: 57m 20s -> 1h 2m (+9.8%)
  10. optional-x86_64-gnu-parallel-frontend: 2h 18m -> 2h 31m (+9.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
Copy link
Collaborator

Finished benchmarking commit (798a011): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (secondary 2.3%)

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

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.3% [2.3%, 2.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 481.843s -> 481.81s (-0.01%)
Artifact size: 396.85 MiB -> 394.88 MiB (-0.50%)

@Zalathar Zalathar deleted the rollup-tKflfa5 branch March 14, 2026 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. O-apple Operating system: Apple / Darwin (macOS, iOS, tvOS, visionOS, watchOS) rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants