Skip to content

Rollup of 10 pull requests#155077

Merged
rust-bors[bot] merged 26 commits intorust-lang:mainfrom
jhpratt:rollup-6HqPjEt
Apr 10, 2026
Merged

Rollup of 10 pull requests#155077
rust-bors[bot] merged 26 commits intorust-lang:mainfrom
jhpratt:rollup-6HqPjEt

Conversation

@jhpratt
Copy link
Copy Markdown
Member

@jhpratt jhpratt commented Apr 10, 2026

Successful merges:

r? @ghost

Create a similar rollup

Darksonn and others added 26 commits April 1, 2026 12:38
Two dedicated target maintainers are needed for tier 2 promotion.
Coordinated with the existing maintainer @androm3da.
This is required for rust-analyzer.
Break a single query cycle in the deadlock handler

This simplifies the query cycle handling by only breaking a single query cycle each time the deadlock handler is called.
Implement `GenericTypeVisitable` for some types

This is required for rust-analyzer.

r? types
Fix linker error by resolving regions for main return type obligations

This PR fix linker error by resolving regions for main return type obligations as discussed in rust-lang#148421

Added a final check . Now the compiler double-checks the lifetimes for main right away. If they don't work it stops and gives the user a clean compiler error instead of a linker crash.

Fixes rust-lang#148421.
…davidtwco

hwaddress: automatically add `-Ctarget-feature=+tagged-globals`

Note that since HWAddressSanitizer is/should be a target modifier, we do not have to worry about whether this LLVM target feature changes the ABI.

Fixes: rust-lang#148185
…O8Ki

Add myself as co-maintainer for hexagon-unknown-linux-musl

Two dedicated target maintainers are needed for tier 2 promotion. Coordinated with the existing maintainer r? @androm3da.
…3899, r=Kivooeo

Add tests for three fixed issues (an LLVM crash, an ICE and poor codegen)

Closes rust-lang#104037.
Closes rust-lang#112623.
Closes rust-lang#113899.
…thanBrouwer

minor follow up to removing soft mode `#[unstable]`

Follow up to rust-lang#153622
r? JonathanBrouwer
…adwinwhite

Fix if branch in op.rs

I removed the if guard without thinking in rust-lang#154223. Really sorry about this.

r? @hkBst
…=Kivooeo

Deny `#[global_allocator]` + `#[thread_local]`

This forbids using `#[thread_local]` on `static` items that are also `#[global_allocator]`s.

Fixes rust-lang#85517.
…lt, r=jieyouxu

Set the Fuchsia ABI to the documented minimum

Fuchsia only supports the RVA22 + vector as its minimum ABI for RISC-V.

See: [fuchsia.dev/fuchsia-src/contribute/governance/rfcs/0234_riscv_abi_rva22+v](https://fuchsia.dev/fuchsia-src/contribute/governance/rfcs/0234_riscv_abi_rva22+v)[fuchsia.dev/fuchsia-src/contribute/governance/rfcs/0234_riscv_abi_rva22+v](https://fuchsia.dev/fuchsia-src/contribute/governance/rfcs/0234_riscv_abi_rva22+v)
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Apr 10, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) PG-exploit-mitigations Project group: Exploit mitigations labels Apr 10, 2026
@rustbot rustbot added 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 Apr 10, 2026
@jhpratt
Copy link
Copy Markdown
Member Author

jhpratt commented Apr 10, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 10, 2026

📌 Commit 4f606c8 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 Apr 10, 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 Apr 10, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Apr 10, 2026

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 31m 25s
Pushing 25a54d4 to main...

@rust-bors rust-bors bot merged commit 25a54d4 into rust-lang:main Apr 10, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Apr 10, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#151377 Fix linker error by resolving regions for main return type … 8c5bd21611e5ec4cb84d4580ab6fa7a4855e00bd (link)
#154677 hwaddress: automatically add `-Ctarget-feature=+tagged-glob… 9d945a7100365abd908e0238754b0a00472bdba8 (link)
#154774 Add myself as co-maintainer for hexagon-unknown-linux-musl c91ccdd26ebebc27f25baee10bb9eadb011cbe5a (link)
#154973 Break a single query cycle in the deadlock handler c5aa313a5787e8f3f62fd7f0e84cfd4f2226c43e (link)
#155015 Add tests for three fixed issues (an LLVM crash, an ICE and… 5ed070b22b6e2dfdad1d36f55483567444413226 (link)
#155034 Implement GenericTypeVisitable for some types 34e0ed3a7b32f1fb73e8deca591152c20fe725e5 (link)
#155039 minor follow up to removing soft mode #[unstable] 43eb68cc12290022317e3b04e1cfd3770a233365 (link)
#155043 Fix if branch in op.rs 49098f6c933bcb5c55c0b8832a75d215e93c6526 (link)
#155071 Deny #[global_allocator] + #[thread_local] e5561466cea17dadfdcfc3fcf9184894f25642bc (link)
#155072 Set the Fuchsia ABI to the documented minimum 2a529cd23888b991bf3ec0936f4ad925e6df9445 (link)

previous master: 7659cec4ed

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 7659cec (parent) -> 25a54d4 (this PR)

Test differences

Show 14 test diffs

Stage 1

  • [ui] tests/ui/allocator/no-thread-local.rs: [missing] -> pass (J0)
  • [ui] tests/ui/derives/clone-vector-element-size.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/const-traits/self-receiver-type-mismatch.rs: [missing] -> pass (J0)
  • [ui] tests/ui/typeck/main-termination-lifetime-issue-148421.rs: [missing] -> pass (J0)
  • [codegen] tests/codegen-llvm/enum/enum-array-index-spare-niche.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/allocator/no-thread-local.rs: [missing] -> pass (J2)
  • [ui] tests/ui/derives/clone-vector-element-size.rs: [missing] -> pass (J2)
  • [ui] tests/ui/traits/const-traits/self-receiver-type-mismatch.rs: [missing] -> pass (J2)
  • [ui] tests/ui/typeck/main-termination-lifetime-issue-148421.rs: [missing] -> pass (J2)
  • [codegen] tests/codegen-llvm/enum/enum-array-index-spare-niche.rs: [missing] -> pass (J3)

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 25a54d4ba87873ef02ef0e5fce49baa57198deb3 --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-msvc-ext2: 1h 25m -> 1h 55m (+34.2%)
  2. dist-aarch64-apple: 1h 36m -> 1h 57m (+22.0%)
  3. dist-aarch64-llvm-mingw: 1h 50m -> 1h 35m (-13.6%)
  4. x86_64-gnu-nopt: 2h 13m -> 2h 28m (+11.2%)
  5. aarch64-apple: 3h 5m -> 3h 23m (+10.0%)
  6. aarch64-gnu-debug: 1h 20m -> 1h 12m (-9.6%)
  7. dist-apple-various: 1h 45m -> 1h 36m (-9.0%)
  8. x86_64-mingw-2: 2h 27m -> 2h 38m (+7.2%)
  9. x86_64-gnu-stable: 2h 17m -> 2h 26m (+6.8%)
  10. x86_64-gnu-llvm-22-1: 1h 14m -> 1h 9m (-6.3%)
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 (25a54d4): 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 (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)
- - 0
Regressions ❌
(secondary)
6.9% [6.9%, 6.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-6.2% [-6.2%, -6.2%] 1
All ❌✅ (primary) - - 0

Cycles

Results (secondary -3.1%)

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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.1% [-3.6%, -2.6%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 492.281s -> 488.4s (-0.79%)
Artifact size: 395.57 MiB -> 395.55 MiB (-0.01%)

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

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. PG-exploit-mitigations Project group: Exploit mitigations 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.