Skip to content

Rollup of 15 pull requests#158508

Merged
rust-bors[bot] merged 128 commits into
rust-lang:mainfrom
jhpratt:rollup-FKOfwV9
Jun 28, 2026
Merged

Rollup of 15 pull requests#158508
rust-bors[bot] merged 128 commits into
rust-lang:mainfrom
jhpratt:rollup-FKOfwV9

Conversation

@jhpratt

@jhpratt jhpratt commented Jun 28, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

cuviper and others added 30 commits February 25, 2026 09:20
If someone considers moving from `option.into_iter().flatten()` to
`option.into_flat_iter()`, it may be important for performance that this
iterator "specializes" methods the same way `Flatten` does, especially
forwarding to underlying `fold`, etc.
This updates the rust-version file to 029c9e1.
Correct some wrong uses of LLVM intrinsics
The CRC[C].W.{B,H}.W only consume the low 8/16 bits of the input operand.
The previous unsigned cast was a workaround for Miri's software
implementation.

Miri now masks the inputs to match hardware semantics, and LLVM will
learn the demanded-bits property of CRC intrinsics, so the explicit
zero-extension is no longer required.
loongarch: Remove explicit zero-extension from CRC[C].W.{B,H}.W
We still only support `PROT_READ|PROT_WRITE`, so `mprotect` is a no-op
other than validating arguments.

We only implement `madvise` for the hints that can be ignored without
a change in semantic (e.g. no `MADV_DONTNEED`, so it is also a no-op
other than validating arguments.
These intrinsics need `Arguments_Preparation` added so that the
intrinsic-test tool knows to generate const arguments.
These intrinsics need `Arguments_Preparation` added so that the
intrinsic-test tool knows to generate const arguments.
Clang uses the `llvm.aarch64.sve.rev.bN` intrinsic for `svrev` with
`b16`, `b32` and `b64`. This required small generator changes so it knew
a bool-to-bool conversion was a no-op and a new blanket identity impl of
`SveInto` so the calls generated compile.
Clang uses the `llvm.aarch64.sve.zip.bN` intrinsic for `svzip` with
`b16`, `b32` and `b64` and the `llvm.aarch64.sve.uzp.bN` intrinsic for
`svuzp` with the same types.
Forward addl. arguments to `intrinsic-test.sh` to `cargo test` so that
`--no-fail-fast` or a specific test name can be passed.
…e-sve

update `arm_intrinsics.json` for `svset` and `svget`
intrinsic-test: fwd args in `intrinsic-test.sh`
…on-svrev-svzip-svuzp

core_arch: redefine `svrev`, `svzip` and `svuzp`
This updates the rust-version file to 8e15021.
@rustbot rustbot added A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Jun 28, 2026
@jhpratt

jhpratt commented Jun 28, 2026

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 2f26f3a 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 Jun 28, 2026
@rust-bors

This comment has been minimized.

@jhpratt

jhpratt commented Jun 28, 2026

Copy link
Copy Markdown
Member Author

@bors treeclosed-

@rust-bors

rust-bors Bot commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

Tree is now open for merging.

@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 Jun 28, 2026
@rust-bors

rust-bors Bot commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: jhpratt
Duration: 3h 12m 6s
Pushing fd07dbf to main...

@rust-bors rust-bors Bot merged commit fd07dbf into rust-lang:main Jun 28, 2026
14 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 28, 2026
@jhpratt jhpratt deleted the rollup-FKOfwV9 branch June 28, 2026 05:50
@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 8b95a26 (parent) -> fd07dbf (this PR)

Test differences

Show 541 test diffs

Stage 1

  • [ui] tests/ui/associated-types/projection-as-type-alias.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-types/resolve-method-with-missing-assoc-type.rs: [missing] -> pass (J0)
  • [ui] tests/ui/drop/drop-with-trait-bound-calls-method-on-self.rs: [missing] -> pass (J0)
  • [ui] tests/ui/drop/dropflag-reinit-in-loop.rs: [missing] -> pass (J0)
  • [ui] tests/ui/dropck/self-referential-struct-with-boxed-closure.rs: [missing] -> pass (J0)
  • [ui] tests/ui/dyn-compatibility/method-with-self-trait-bound-not-dyn-safe.rs: [missing] -> pass (J0)
  • [ui] tests/ui/higher-ranked/region-leak-rc-and-mut-ptr.rs: [missing] -> pass (J0)
  • [ui] tests/ui/inference/closure-arg-lifetime-by-ref.rs: [missing] -> pass (J0)
  • [ui] tests/ui/issues/issue-2761.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-27815.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-28279.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-28344.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-28600.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-28936.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-41974.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-48132.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-50781.rs: pass -> [missing] (J0)
  • [ui] tests/ui/lifetimes/lifetime-errors/trait-method-return-lifetime-mismatch.rs: [missing] -> pass (J0)
  • [ui] tests/ui/macros/assert-with-custom-message.rs: [missing] -> pass (J0)
  • [ui] tests/ui/methods/supertrait-shadowing/common-ancestor-3.rs: pass -> [missing] (J0)
  • [ui] tests/ui/methods/supertrait-shadowing/false-subtrait-after-inference.rs: pass -> [missing] (J0)
  • [ui] tests/ui/methods/supertrait-shadowing/no-common-ancestor-2.rs: pass -> [missing] (J0)
  • [ui] tests/ui/methods/supertrait-shadowing/trivially-false-subtrait.rs: pass -> [missing] (J0)
  • [ui] tests/ui/methods/supertrait-shadowing/unstable.rs#off_shadowing: pass -> [missing] (J0)
  • [ui] tests/ui/methods/supertrait-shadowing/unstable.rs#on_shadowing: pass -> [missing] (J0)
  • [ui] tests/ui/supertrait-shadowing/common-ancestor-2.rs: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/common-ancestor.rs: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/definition-site.rs: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/false-subtrait-after-inference.rs: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/no-common-ancestor-2.rs: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/no-common-ancestor.rs: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/out-of-scope.rs: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/trivially-false-subtrait.rs: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/type-dependent.rs: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/unstable.rs#off_shadowing: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/unstable.rs#on_normal: [missing] -> pass (J0)
  • [ui] tests/ui/supertrait-shadowing/unstable.rs#on_shadowing: [missing] -> pass (J0)
  • [ui] tests/ui/unsafe/unsafe-fn-called-through-ref.rs: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/borrowck/enum-variants-share-field-name.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/derives/clone-copy/derive-copy-clone-non-copy-field-diagnostic.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/dropck/self-referential-struct-with-boxed-closure.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/dyn-compatibility/method-with-self-trait-bound-not-dyn-safe.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/higher-ranked/region-leak-rc-and-mut-ptr.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/issues/issue-27815.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/issues/issue-28279.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/issues/issue-28344.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/issues/issue-28472.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/issues/issue-28498-must-work-ex2.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/issues/issue-28550.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/issues/issue-28999.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/issues/issue-48132.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/lifetimes/lifetime-errors/trait-method-return-lifetime-mismatch.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/macros/assert-with-custom-message.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/methods/supertrait-shadowing/common-ancestor.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/methods/supertrait-shadowing/no-common-ancestor-2.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/methods/supertrait-shadowing/out-of-scope.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/methods/supertrait-shadowing/trivially-false-subtrait.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/methods/supertrait-shadowing/unstable.rs#off_normal: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/methods/supertrait-shadowing/unstable.rs#on_normal: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/rfcs/rfc-1238-nonparametric-dropck/reject-ex1.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/rfcs/rfc-1238-nonparametric-dropck/ugeh-ex1.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/supertrait-shadowing/assoc-const.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/supertrait-shadowing/assoc-type-predicates.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/supertrait-shadowing/common-ancestor-2.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/supertrait-shadowing/common-ancestor-3.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/supertrait-shadowing/no-common-ancestor-2.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/supertrait-shadowing/no-common-ancestor.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/supertrait-shadowing/trivially-false-subtrait.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/supertrait-shadowing/unstable.rs#off_normal: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/supertrait-shadowing/unstable.rs#on_shadowing: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/associated-types/nested-fnonce-output-projection.rs: [missing] -> pass (J2)
  • [ui] tests/ui/borrowck/enum-variants-share-field-name.rs: [missing] -> pass (J2)
  • [ui] tests/ui/drop/drop-with-trait-bound-calls-method-on-self.rs: [missing] -> pass (J2)
  • [ui] tests/ui/dropck/drop-impl-for-type-param-with-trait-bound.rs: [missing] -> pass (J2)
  • [ui] tests/ui/dropck/dropck-resolves-associated-type-in-field.rs: [missing] -> pass (J2)
  • [ui] tests/ui/dyn-compatibility/method-with-self-trait-bound-not-dyn-safe.rs: [missing] -> pass (J2)
  • [ui] tests/ui/extern/extern-c-method-with-str-param.rs: [missing] -> pass (J2)
  • [ui] tests/ui/higher-ranked/region-leak-rc-and-mut-ptr.rs: [missing] -> pass (J2)
  • [ui] tests/ui/issues/issue-27949.rs: pass -> [missing] (J2)
  • [ui] tests/ui/issues/issue-28344.rs: pass -> [missing] (J2)
  • [ui] tests/ui/issues/issue-28498-ugeh-ex1.rs: pass -> [missing] (J2)
  • [ui] tests/ui/issues/issue-41974.rs: pass -> [missing] (J2)
  • [ui] tests/ui/issues/issue-4252.rs: pass -> [missing] (J2)
  • [ui] tests/ui/issues/issue-48132.rs: pass -> [missing] (J2)
  • [ui] tests/ui/issues/issue-50781.rs: pass -> [missing] (J2)
  • [ui] tests/ui/lifetimes/field-borrow-lifetime-inference.rs: [missing] -> pass (J2)
  • [ui] tests/ui/lifetimes/lifetime-errors/trait-method-return-lifetime-mismatch.rs: [missing] -> pass (J2)
  • [ui] tests/ui/methods/supertrait-shadowing/no-common-ancestor-2.rs: pass -> [missing] (J2)
  • [ui] tests/ui/methods/supertrait-shadowing/no-common-ancestor.rs: pass -> [missing] (J2)
  • [ui] tests/ui/methods/supertrait-shadowing/out-of-scope.rs: pass -> [missing] (J2)
  • [ui] tests/ui/methods/supertrait-shadowing/unstable.rs#off_normal: pass -> [missing] (J2)
  • [ui] tests/ui/methods/supertrait-shadowing/unstable.rs#off_shadowing: pass -> [missing] (J2)
  • [ui] tests/ui/rfcs/rfc-1238-nonparametric-dropck/must-work-ex1.rs: [missing] -> pass (J2)
  • [ui] tests/ui/supertrait-shadowing/assoc-type.rs: [missing] -> pass (J2)
  • [ui] tests/ui/supertrait-shadowing/common-ancestor-3.rs: [missing] -> pass (J2)
  • [ui] tests/ui/supertrait-shadowing/definition-site.rs: [missing] -> pass (J2)
  • [ui] tests/ui/supertrait-shadowing/unstable.rs#off_normal: [missing] -> pass (J2)
  • [ui] tests/ui/supertrait-shadowing/unstable.rs#on_normal: [missing] -> pass (J2)
  • [ui] tests/ui/unsafe/unsafe-fn-called-through-ref.rs: [missing] -> pass (J2)
  • [rustdoc-json] tests/rustdoc-json/impls/fundamental_nesting.rs: [missing] -> pass (J3)

(and 153 additional test diffs)

Additionally, 288 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 fd07dbfc91b7b6b3fa76d957e130c51e654131ee --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-gnu-gcc-core-tests: 7m 57s -> 13m 53s (+74.7%)
  2. x86_64-gnu-debug: 1h 30m -> 2h 10m (+45.1%)
  3. i686-gnu-nopt-1: 1h 37m -> 2h 16m (+40.5%)
  4. x86_64-gnu-llvm-21-3: 1h 18m -> 1h 50m (+39.7%)
  5. pr-check-2: 27m 24s -> 37m 41s (+37.5%)
  6. x86_64-mingw-1: 2h 9m -> 2h 55m (+35.4%)
  7. test-various: 1h 28m -> 1h 59m (+34.6%)
  8. dist-x86_64-msvc-alt: 2h 47m -> 2h 3m (-26.4%)
  9. dist-x86_64-linux-alt: 1h 58m -> 2h 27m (+25.1%)
  10. dist-ohos-x86_64: 1h 1m -> 1h 16m (+24.2%)
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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#152225 Add supertrait item shadowing for type-level path resolution 7e0e0a36cf77923ee6ca20188bd36341db797c4e (link)
#153097 Expand OptionFlatten's iterator methods acc5aec391c1438dfbaad7c73ea9b266bb00a61b (link)
#157614 Move tests drop 0c996cccbfd93bf7838eafc5b3daf3ad4507177b (link)
#157996 perf: drop the full-crate AST walk in check_unused 86cf309bdda6d18d0eaeb9d52f498c5a30292755 (link)
#158163 Fix too-short variance slice in variances_of cycle recove… 671406f91ae2478eed02af17397a98437add5636 (link)
#158194 Adds RmetaLinkCache a per-link cache that uses path as the … 49d7c90554888fd19bfff1193c5e5e90cc227970 (link)
#158233 Allow the unstable attribute on foreign type bcce11fb39984135765c25b9ba394f4c12150ca1 (link)
#158433 Fix inconsistent safety requirement in VecDeque::nonoverlap… b67a51f8ea4ed7158086a1adedbd795c8e0ad696 (link)
#158464 Reorganize tests/ui/issues [15/N] fa4d43ed9094a7ec0de0b26d5cb41dd83e2abe1a (link)
#158466 rustdoc: show impl Trait<Box> for Foreign, etc on Lo… c3e0428e118d226736a930e3148b5ccb3dbbf675 (link)
#158470 Upgrade jsonsocck and jsondoclint to edition 2024. d2979e913daa928e6272464b1d30833730a4eda9 (link)
#158485 Reorganize tests/ui/issues [16/N] 6ae66d5a30ec4d8b7a9679c115522b65e0590851 (link)
#158488 Upgrade rustdoc-json-types to 2024 edition. 106fb7a4988cedbe4c48c4597872f0d2fb0b1dcb (link)
#158497 stdarch subtree update 96b6c4494ca2b21b584f1a89c9c162d8730b2de5 (link)
#158501 miri subtree update c3ec7ba45607b882a0f6d9813287528bb18e15aa (link)

previous master: 8b95a26baf

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (fd07dbf): comparison URL.

Overall result: ❌✅ regressions and improvements - please read:

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.4% [0.3%, 0.5%] 6
Improvements ✅
(primary)
-0.2% [-0.3%, -0.2%] 43
Improvements ✅
(secondary)
-0.3% [-0.4%, -0.2%] 20
All ❌✅ (primary) -0.2% [-0.3%, -0.2%] 43

Max RSS (memory usage)

Results (primary -2.5%, secondary 4.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)
4.3% [1.7%, 7.0%] 2
Improvements ✅
(primary)
-2.5% [-2.9%, -2.0%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.5% [-2.9%, -2.0%] 2

Cycles

Results (secondary -2.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)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) - - 0

Binary size

Results (secondary 0.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)
0.0% [0.0%, 0.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Bootstrap: 486.43s -> 485.647s (-0.16%)
Artifact size: 393.64 MiB -> 393.58 MiB (-0.01%)

@rustbot rustbot added the perf-regression Performance regression. label Jun 28, 2026
@jhpratt

jhpratt commented Jun 28, 2026

Copy link
Copy Markdown
Member Author

The change is the same as #157996, which was explicitly listed as perf. The overall improvement was deemed to be worth it.

@rustbot label +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) 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) A-rustdoc-json Area: Rustdoc JSON backend A-tidy Area: The tidy tool merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.