Skip to content

Rollup of 5 pull requests#155576

Merged
rust-bors[bot] merged 11 commits intorust-lang:mainfrom
jhpratt:rollup-F5kv4Uy
Apr 21, 2026
Merged

Rollup of 5 pull requests#155576
rust-bors[bot] merged 11 commits intorust-lang:mainfrom
jhpratt:rollup-F5kv4Uy

Conversation

@jhpratt
Copy link
Copy Markdown
Member

@jhpratt jhpratt commented Apr 21, 2026

Successful merges:

r? @ghost

Create a similar rollup

sharesth23 and others added 11 commits April 20, 2026 00:01
Update  so the LLVM
CMake example uses  and , which is the
correct list separator syntax for LLVM CMake options.[Docs] Remove shortcode from models page heading
This updates the rule names for shebang which were changed in
rust-lang/reference#2192 and rust-lang/reference#2199.
Offload slice support

This PR allows offload to support slice type arguments.

~NOTE: this is built on top of rust-lang#152283

r? @ZuseZ4
…ove-help, r=chenyukang

Make E0284 generic argument suggestions more explicit

Closes rust-lang#147313

Previously, when type annotations were missing for a function call, rust suggested: "consider specifying the generic argument". This PR improves the diagnostics:

- If only one generic type is missing:
  "consider specifying a concrete type for the generic type `<T>`" with the turbofish being "::\<SomeConcreteType>"
- If only one const generic is missing:
  "consider specifying a const for the const generic `<CONST>`" with the turbofish being "::<SOME_CONST>"

Multiple missing generics still produce the original more general suggestion
…agnostic, r=chenyukang

Suggest removing `&` when awaiting a reference to a future

Fixes rust-lang#87211

When `.await`ing `&impl Future`, suggest removing the `&` instead of removing `.await`.
Fix LLVM offload install docs to use semicolon-separated CMake lists

Update  so the LLVM CMake example uses  and , which is the correct list separator syntax for LLVM CMake options.[Docs] Remove shortcode from models page heading
Update books

## rust-embedded/book

2 commits in 2463edeb8003c5743918b3739a9f6870b86396f5..0789b0f29e73ecb91213cac10ad0eec1b9333770
2026-04-11 08:46:22 UTC to 2026-04-10 14:01:38 UTC

- remove IO chapter, is covered in next chapter (rust-embedded/book#411)
- add embassy chapter (rust-embedded/book#412)

## rust-lang/reference

10 commits in d2715c07e9dd9839c0c7675ecfa18bec539a6ee9..8c88f9d0bdd75ffdc0691676d83212ae22a18cee
2026-04-20 15:20:24 UTC to 2026-04-07 16:25:09 UTC

- typo in example code (rust-lang/reference#2232)
- oxford comma (rust-lang/reference#2233)
- improve readability (rust-lang/reference#2234)
- typo (rust-lang/reference#2230)
- Clarify items.fn.generics.param-bounds (rust-lang/reference#2229)
- follow formatting style guideline (rust-lang/reference#2228)
- Update `derive` export locations (rust-lang/reference#2223)
- Clarify that `{self}` imports require a module parent (rust-lang/reference#2221)
- stabilize s390x vector registers (rust-lang/reference#2215)
- Fix misuse of *usage* throughout the Reference (rust-lang/reference#2222)

## rust-lang/rust-by-example

2 commits in b31e3b8da01eeba0460f86a52a55af82709fadf5..898f0ac1479223d332309e0fce88d44b39927d28
2026-04-19 11:40:28 UTC to 2026-04-19 11:38:45 UTC

- remove debug printing for the u32 and bool in variable_bindings.md (rust-lang/rust-by-example#1999)
- Update for.md (rust-lang/rust-by-example#2008)
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Apr 21, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-rustc-dev-guide Area: rustc-dev-guide 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Apr 21, 2026
@jhpratt
Copy link
Copy Markdown
Member Author

jhpratt commented Apr 21, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 21, 2026

📌 Commit c7ccec1 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 21, 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 21, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 21, 2026

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

@rust-bors rust-bors Bot merged commit 84c1190 into rust-lang:main Apr 21, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 21, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#153411 Offload slice support 9edf062af5dea64e9e8c24a7bea9ac1b348e902c (link)
#154557 Make E0284 generic argument suggestions more explicit 5d3c0f0c0dce8bc03cbab3fbed8cd966dd29751d (link)
#154933 Suggest removing & when awaiting a reference to a future 7b4f347fd0897a63ec114e17501f0a726d17a89b (link)
#155524 Fix LLVM offload install docs to use semicolon-separated CM… ac814902e64ce8917a40482f00c17bf84d66b737 (link)
#155568 Update books 549f75ab9ee28868c65227e4909d213c11d88138 (link)

previous master: 4fbae3e309

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 4fbae3e (parent) -> 84c1190 (this PR)

Test differences

Show 27 test diffs

Stage 1

  • [ui] tests/ui/async-await/await-ref-future.rs: [missing] -> pass (J1)
  • [ui] tests/ui/inference/need_type_info/single-const-generic-suggestion.rs: [missing] -> pass (J1)
  • [ui] tests/ui/inference/need_type_info/single-type-generic-suggestion.rs: [missing] -> pass (J1)
  • [codegen] tests/codegen-llvm/gpu_offload/slice_device.rs#amdgpu: [missing] -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J3)
  • [codegen] tests/codegen-llvm/gpu_offload/slice_device.rs#nvptx: [missing] -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J3)
  • [codegen] tests/codegen-llvm/gpu_offload/slice_host.rs: [missing] -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J3)

Stage 2

  • [codegen] tests/codegen-llvm/gpu_offload/slice_device.rs#amdgpu: [missing] -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J0)
  • [codegen] tests/codegen-llvm/gpu_offload/slice_device.rs#nvptx: [missing] -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J0)
  • [codegen] tests/codegen-llvm/gpu_offload/slice_host.rs: [missing] -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J0)
  • [ui] tests/ui/async-await/await-ref-future.rs: [missing] -> pass (J2)
  • [ui] tests/ui/inference/need_type_info/single-const-generic-suggestion.rs: [missing] -> pass (J2)
  • [ui] tests/ui/inference/need_type_info/single-type-generic-suggestion.rs: [missing] -> pass (J2)

Additionally, 15 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 84c11900724736a2b9afac4822031d78a9ed8e86 --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. i686-msvc-1: 2h 23m -> 3h 8m (+31.1%)
  2. x86_64-rust-for-linux: 42m 49s -> 55m 2s (+28.5%)
  3. dist-ohos-aarch64: 1h 24m -> 1h 3m (-25.2%)
  4. i686-gnu-nopt-2: 1h 44m -> 2h 10m (+24.9%)
  5. x86_64-gnu-stable: 2h 24m -> 1h 50m (-23.5%)
  6. dist-powerpc64-linux-musl: 1h 35m -> 1h 14m (-21.7%)
  7. x86_64-msvc-2: 2h 29m -> 1h 58m (-21.1%)
  8. dist-i686-linux: 1h 30m -> 1h 49m (+21.0%)
  9. x86_64-gnu-llvm-22-2: 1h 21m -> 1h 38m (+20.6%)
  10. pr-check-1: 27m 43s -> 33m 5s (+19.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 (84c1190): 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 -2.6%)

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)
-2.6% [-2.6%, -2.6%] 1
All ❌✅ (primary) - - 0

Cycles

Results (primary -2.0%, secondary 2.0%)

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)
3.2% [2.0%, 4.2%] 6
Improvements ✅
(primary)
-2.0% [-2.0%, -2.0%] 2
Improvements ✅
(secondary)
-5.3% [-5.3%, -5.3%] 1
All ❌✅ (primary) -2.0% [-2.0%, -2.0%] 2

Binary size

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

Bootstrap: 492.186s -> 490.276s (-0.39%)
Artifact size: 394.40 MiB -> 394.36 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-rustc-dev-guide Area: rustc-dev-guide 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. 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.

8 participants