Skip to content

Rollup of 6 pull requests - #164708

Merged
rust-bors[bot] merged 15 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Td0LIV7
Oct 21, 2026
Merged

rust-bors[bot] merged 15 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Td0LIV7

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

Sa4dUs and others added 15 commits September 23, 2026 15:06
Constructing `expected_ty` when either cfi-diag or cfi-recover is
enabled, causes rustc to format function argument and return types using
the Display trait.

Calling Display::fmt on user-defined/ADT types calls `trimmed_def_paths`
requiring compiler diagnostic causing a crash within rustc if the
crate is built without errors/warnings. To avoid this, it needs to be
wrapped by `rustc_middle::ty::print::with_no_trimmed_paths!`.
handle higher-ranked preds in imperfect derives diagnostic

`trait_args` can contain escaping bound vars if we need to prove something like `for<'a> &'a T: Clone`, and since we call `skip_binder()` on `parent_trait_pred` to build the new trait ref's args, we need to rebind any bound vars we may encounter in the args.

fixes rust-lang#164376
…rcvalle

Wrap expected_ty for cfi-{diag,recover} in with_no_trimmed_paths

Constructing `expected_ty` when either cfi-diag or cfi-recover is enabled, causes rustc to format function argument and return types using the Display trait.

Calling Display::fmt on user-defined/ADT types calls `trimmed_def_paths` requiring compiler diagnostic causing a crash within rustc if the crate is built without errors/warnings. To avoid this, it needs to be wrapped by `rustc_middle::ty::print::with_no_trimmed_paths!`.

r? @rcvalle
…lify, r=scottmcm

Remove redundant `PartialOrd` chaining methods

I'm currently trying to do some optimizations using the `PartialOrd` chaining methods, and I noticed that `__chaining_le` and `__chaining_lt` are actually exactly the same for all implementations (and likewise `__chaining_ge`/`__chaining_gt`).

In particular,
- `__chaining_le`/`__chaining_lt` returns `Continue(())` if `self == other`, else `Break(self <= other)`/`Break(self < other)`
- We require that `a <= b` iff `a < b` or `a == b`. So it doesn't matter (for well-behaved impls) if we break with `self <= other` or `self < other`.
- All explicit impls of the chaining methods are in std, and well-behaved, as this is an internal API (except tuples and slices may not be well-behaved if their items aren't. For them, equivalence follows from the equivalence for their items, inductively).
- All other impls of the chaining methods are using the default impl, based on matching `Option<Ordering>` from `partial_cmp`:
  https://github.com/rust-lang/rust/blob/1731faea0da5b4ebf881d8e53f98066c17a74711/library/core/src/cmp.rs#L1613-L1617
  Using `Ordering::is_le`/`Ordering::is_lt` for `p` is the same here, as `Some(Equal)` gets matched early. Thus, even non-well-behaved `PartialOrd` impls (i.e. those with non-conforming `le`/`lt`/`eq` methods) have identically behaving `__chaining_le`/`__chaining_lt`.

We can conclude that merging `__chaining_le`/`__chaining_lt` doesn't change behavior. You can verify the above points by looking at the diff, as every such method pair has been touched.

r? scottmcm
Picking you as reviewer because you also reviewed my earlier PR that optimized chaining ops on tuples, and appear to also have done some work on these methods before. Feel free to reroll.
Offload safe mutable args with `Region` and `PartitioningStrategy`

Now `Region` are lang items and mapped as slices.
~needs rust-lang#156620 to work~

r? @ZuseZ4
Add regression test for async fn declared with #[eii]

Fixes rust-lang#154533

The ICE was fixed by rust-lang#156742.
…x, r=petrochenkov

Add `#[default]` for `newtype_index!`

Add `#[default]` for `newtype_index!`.

We can merge it before or after rust-lang#164425.

r? @petrochenkov
@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 PG-exploit-mitigations Project group: Exploit mitigations 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-libs Relevant to the library team, which will review and decide on the PR/issue. labels Oct 21, 2026
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Oct 21, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5 force

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,test-x86_64-gnu-aux,test-x86_64-msvc-1,test-aarch64-apple-1,test-aarch64-apple-2,test-x86_64-mingw-1,test-i686-msvc,test-armhf-gnu,test-x86_64-gnu-llvm-22-3

@rust-bors

rust-bors Bot commented Oct 21, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0e758be has been approved by JonathanBrouwer

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 Oct 21, 2026
rust-bors Bot pushed a commit that referenced this pull request Oct 21, 2026
Rollup of 6 pull requests


try-job: dist-various-1
try-job: test-various
try-job: test-x86_64-gnu-aux
try-job: test-x86_64-msvc-1
try-job: test-aarch64-apple-1
try-job: test-aarch64-apple-2
try-job: test-x86_64-mingw-1
try-job: test-i686-msvc
try-job: test-armhf-gnu
try-job: test-x86_64-gnu-llvm-22-3
@rust-bors

This comment has been minimized.

@rust-bors

This comment has been minimized.

@rust-bors

rust-bors Bot commented Oct 21, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 2da9ca5 (2da9ca509ae5a3a8e086cda1588cac6ea412bc3b)
Base parent: 6a58677 (6a58677913ae3e443146503de3933abef0b2eda3)

@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 Oct 21, 2026
@rust-bors

rust-bors Bot commented Oct 21, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 13m 21s
Pushing 1a2c479 to main...

@rust-bors
rust-bors Bot merged commit 1a2c479 into rust-lang:main Oct 21, 2026
16 checks passed
@rustbot rustbot added this to the 1.101.0 milestone Oct 21, 2026
@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 fa0b453 (parent) -> 1a2c479 (this PR)

Test differences

Show 157 test diffs

Stage 1

  • [ui (polonius)] tests/ui/derives/imperfect-derive-higher-ranked.rs: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/eii/async-eii-declaration-ice-154533.rs#current: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/eii/async-eii-declaration-ice-154533.rs#next: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/offload/region_borrow.rs: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/offload/region_by_ref.rs: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/offload/region_launch_bounds.rs: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/offload/region_not_copy.rs: [missing] -> pass (J0)
  • [ui] tests/ui/derives/imperfect-derive-higher-ranked.rs: [missing] -> pass (J1)
  • [ui] tests/ui/eii/async-eii-declaration-ice-154533.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/eii/async-eii-declaration-ice-154533.rs#next: [missing] -> pass (J1)
  • [ui] tests/ui/offload/region_borrow.rs: [missing] -> pass (J1)
  • [ui] tests/ui/offload/region_by_ref.rs: [missing] -> pass (J1)
  • [ui] tests/ui/offload/region_launch_bounds.rs: [missing] -> pass (J1)
  • [ui] tests/ui/offload/region_not_copy.rs: [missing] -> pass (J1)
  • [codegen] tests/codegen-llvm/gpu_offload/region_host.rs: [missing] -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J2)

Stage 2

  • [ui] tests/ui/derives/imperfect-derive-higher-ranked.rs: [missing] -> pass (J3)
  • [ui] tests/ui/eii/async-eii-declaration-ice-154533.rs#current: [missing] -> pass (J3)
  • [ui] tests/ui/eii/async-eii-declaration-ice-154533.rs#next: [missing] -> pass (J3)
  • [ui] tests/ui/offload/region_borrow.rs: [missing] -> pass (J3)
  • [ui] tests/ui/offload/region_by_ref.rs: [missing] -> pass (J3)
  • [ui] tests/ui/offload/region_launch_bounds.rs: [missing] -> pass (J3)
  • [ui] tests/ui/offload/region_not_copy.rs: [missing] -> pass (J3)
  • [codegen] tests/codegen-llvm/gpu_offload/region_host.rs: [missing] -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J4)

Additionally, 134 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 1a2c4797ef2570bd76ca5dee34449169bc7dc457 --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-various: 1h 38m -> 2h 30m (+52.3%)
  2. dist-x86_64-msvc-alt: 1h 51m -> 2h 49m (+51.8%)
  3. dist-i686-mingw: 38m 33s -> 56m 47s (+47.3%)
  4. dist-riscv64-linux-gnu: 1h 4m -> 1h 30m (+40.9%)
  5. test-aarch64-msvc-1: 2h 27m -> 1h 30m (-38.5%)
  6. dist-loongarch64-musl: 1h 30m -> 2h 4m (+37.4%)
  7. test-x86_64-gnu-llvm-22-3: 1h 27m -> 1h 59m (+37.1%)
  8. test-x86_64-mingw-1: 3h 6m -> 1h 58m (-36.5%)
  9. test-x86_64-msvc-ext1: 2h 12m -> 1h 25m (-35.6%)
  10. dist-powerpc64-linux-musl: 1h 40m -> 1h 8m (-31.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
Copy Markdown
Collaborator

Finished benchmarking commit (1a2c479): 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.0% [0.0%, 0.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.6% [-0.6%, -0.6%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 0.4%, secondary -0.4%)

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

mean range count
Regressions ❌
(primary)
2.7% [0.8%, 6.4%] 3
Regressions ❌
(secondary)
4.7% [0.5%, 8.8%] 2
Improvements ✅
(primary)
-0.9% [-1.3%, -0.6%] 5
Improvements ✅
(secondary)
-3.8% [-5.3%, -1.0%] 3
All ❌✅ (primary) 0.4% [-1.3%, 6.4%] 8

Cycles

Results (primary 0.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.1% [0.5%, 2.5%] 16
Regressions ❌
(secondary)
0.9% [0.5%, 2.5%] 7
Improvements ✅
(primary)
-0.8% [-1.4%, -0.5%] 3
Improvements ✅
(secondary)
-0.4% [-0.4%, -0.4%] 1
All ❌✅ (primary) 0.8% [-1.4%, 2.5%] 19

Binary size

Results (primary 0.0%, secondary 0.1%)

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

mean range count
Regressions ❌
(primary)
0.0% [0.0%, 0.1%] 25
Regressions ❌
(secondary)
0.1% [0.0%, 0.1%] 9
Improvements ✅
(primary)
-0.1% [-0.1%, -0.1%] 3
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [-0.1%, 0.1%] 28

Bootstrap: 488.322s -> 487.028s (-0.26%)
Artifact size: 406.47 MiB -> 406.53 MiB (0.02%)

@rust-bors

rust-bors Bot commented Oct 22, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#164383 handle higher-ranked preds in imperfect derives diagnostic 4b9f020a821f57968c12b47de051d7822a23c58f
(link)
#164620 Wrap expected_ty for cfi-{diag,recover} in with_no_trimmed_… 727434b88d83ee16c08fc4703eb8ff68d84f77ff
(link)
#164684 Remove redundant PartialOrd chaining methods 4a2df2e07e719ec266813f3ee0e9ee995d17fe9a
(link)
#158076 Offload safe mutable args with Region and `PartitioningSt… adec0cabcd8ef2c019471ab5049c3f2eb21aec4a
(link)
#164680 Add regression test for async fn declared with #[eii] a6174b157264bd7fc3fe16df7ad30fcb00b9eda4
(link)
#164696 Add #[default] for newtype_index! e33438e54941502d433919d192ac0088c4361cc3
(link)

parent commit: fa0b453578

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-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. 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. 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.

9 participants