Skip to content

Rollup of 12 pull requests#158098

Merged
rust-bors[bot] merged 40 commits into
rust-lang:mainfrom
GuillaumeGomez:rollup-Rdbc7zf
Jun 18, 2026
Merged

Rollup of 12 pull requests#158098
rust-bors[bot] merged 40 commits into
rust-lang:mainfrom
GuillaumeGomez:rollup-Rdbc7zf

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

P8L1 and others added 30 commits May 28, 2026 16:23
* Handle generic reborrow in expression-use adjustment walking
* Require generic reborrow to be terminal in adjustment walks
Co-authored-by: Alice Ryhl <aliceryhl@google.com>
Co-authored-by: Alice Ryhl <aliceryhl@google.com>
Co-authored-by: Kevin Reid <kpreid@switchb.org>
Co-authored-by: Kevin Reid <kpreid@switchb.org>
Co-authored-by: Alice Ryhl <aliceryhl@google.com>
Also replicated documentation on `TyCtxt::module_children`
Co-authored-by: Timo <30553356+y21@users.noreply.github.com>
`accept` can return an error that belongs to a single incoming
connection, not to the listener itself, for example a connection
aborted by the peer before it could be accepted. The listener stays
usable in that case, so code serving a long-lived listener usually
wants to log the error and keep accepting connections rather than
treat it as fatal. This was previously undocumented.

- Add an `# Errors` section to `accept` that describes this behavior
  without listing specific error codes.
- Note that `Interrupted` errors are retried internally on Unix.
- Point `incoming` and `into_incoming` at `accept` for the same
  details.
thin-vec versions before 0.2.16 have a use-after-free / double-free in
`IntoIter::drop` and `ThinVec::clear` when an element's `Drop` panics
(RUSTSEC-2026-0103). The requirement now sits past the affected range.
bincode is flagged as unmaintained by RUSTSEC-2025-0141, and the advisory
covers the entire crate with no patched version available. The only use
in this crate was the binary serde roundtrip in the type tests.

postcard (https://crates.io/crates/postcard) is a maintained serde-based
binary serialization format that covers the same roundtrip testing need.

bincode is still pulled in transitively by the miri subtree (via
ipc-channel), which needs to be addressed upstream.
LLVM uses GlobalISel with -O0 that doesn't support scalable vectors. It
normally falls back to SDAG which does support scalable vectors, but
there's a bug that means that isn't happening for debuginfo - so
temporarily don't emit debuginfo for scalable vector locals when there
are no optimisations until that bug is fixed.

See <llvm/llvm-project#204585>.
…-visitor, r=dingxiangfei2009

Handle generic reborrow in expression-use adjustment walking

Fixes an ICE in expression-use adjustment walking where `Adjust::GenericReborrow` could reach a match arm that assumed generic reborrow was unreachable.

`GenericReborrow` is already emitted by typeck and classified as rvalue-producing elsewhere in `expr_use_visitor.rs`, so the adjustment walker must handle it explicitly instead of panicking.

This PR models `GenericReborrow` as a borrow-like use of the source expression:
- `Mutability::Mut` is treated like an exclusive/mutable reborrow use.
- `Mutability::Not` is treated like a shared/coerce-shared borrow-like use.
- The source is not moved or treated as a mere copy.

cc @aapoalas
@rustbot label F-reborrow
Fixes rust-lang#156339
Tracking: rust-lang#145612
Enhance documentation on wake call memory ordering
Bump thin-vec to 0.2.18 to address RUSTSEC-2026-0103

thin-vec versions before 0.2.16 have a use-after-free / double-free in `IntoIter::drop` and `ThinVec::clear` when an element's `Drop` panics ([RUSTSEC-2026-0103](https://rustsec.org/advisories/RUSTSEC-2026-0103)).

This bumps the requirement in the compiler crates from `0.2.15` to `0.2.18` and updates `Cargo.lock` accordingly, moving past the affected range.
…rrors, r=Darksonn

Document transient connection errors from TcpListener::accept

`TcpListener::accept` can return an error that belongs to a single incoming
connection, not to the listener, for example a connection aborted by the peer
before it could be accepted (`ConnectionAborted`). The listener stays usable, so
a server looping over connections usually wants to log the error and keep
accepting rather than treat it as fatal. This was not documented, and the
`incoming` example treated every error as a failed connection.

This implements the libs-team decision in rust-lang#142557: document these transient
errors instead of changing `accept` to retry them, since retrying would hide
errors that some callers want to observe.

Changes:
- Add an `# Errors` section to `accept` describing this behavior, without
  listing specific error codes since some may be more permanent than others.
- Note that `Interrupted` errors are retried internally on Unix.
- Add the same pointer to `incoming` and `into_incoming`, which are `accept`
  in a loop.

Addresses rust-lang#142557.

r? rust-lang/libs
…llaumeGomez

rustdoc-json-types: Replace bincode dev-dependency with postcard

bincode is flagged as unmaintained by [RUSTSEC-2025-0141](https://rustsec.org/advisories/RUSTSEC-2025-0141), and the advisory covers the entire crate with no patched version available. The only use in `rustdoc-json-types` was the binary serde roundtrip in the type tests.

[postcard](https://crates.io/crates/postcard) is a maintained serde-based binary serialization format that covers the same roundtrip testing need.

bincode is still pulled in transitively by the miri subtree (via `ipc-channel`), which needs to be [addressed upstream](rust-lang/miri#5115).

### Related

- rust-lang/miri#5115
renovate: Loosen dashboard approval and adopt recommended config

Follow-up tweaks to the Renovate config now that the GitHub Actions setup has proven stable.

- GitHub Actions updates no longer need Dependency Dashboard approval. The gate was added while we dialed in the config, and the `github-actions` manager now works well enough for those PRs to open on their own. Everything else still requires approval.
- Monthly lock file maintenance is now enabled. It stays behind dashboard approval for the time being.
- The config extends [`config:recommended`](https://docs.renovatebot.com/presets-config/#configrecommended), which brings changelog links, sensible grouping, `replacements` and `workarounds`. That makes the previously explicit `dependencyDashboard: true` redundant, so it's gone.
- Config migration PRs are enabled so Renovate can keep the config up to date as options get deprecated.
…o-no-opt, r=lqd

codegen_ssa: no dbginfo for scalable vec local w/ `-O0`

LLVM uses GlobalISel with `-O0` that doesn't support scalable vectors. It normally falls back to SDAG which does support scalable vectors, but there's a bug that means that isn't happening for debuginfo - so temporarily don't emit debuginfo for scalable vector locals when there are no optimisations until that bug is fixed.

cc llvm/llvm-project#204585
cc rust-lang/stdarch#2160

r? @lqd
… r=Urgau

Fix invalid "jump-to-def" doc link generation when an item has a `derive` proc-macro

Fixes rust-lang#158050.

The problem is that the proc-macros might generate an impl block `impl $(trait)? for Item` where `Item` then has its span pointing to the current item, overwriting its intra-doc link (hopefully this explanation makes sense ^^').

In short, the proc-macro generates an impl block, the `for Item` makes the code enter `visit_qpath` which in turn calls `handle_path` which will take the span of the last segment of the path (so `Item` here) and use it in the link def "span map".

r? @Urgau
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 18, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustdoc-json Area: Rustdoc JSON backend 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. 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. T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jun 18, 2026
@GuillaumeGomez

Copy link
Copy Markdown
Member Author

@bors r+ p=5 rollup=never

@rust-bors

rust-bors Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

📌 Commit e219d61 has been approved by GuillaumeGomez

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

rust-bors Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: GuillaumeGomez
Duration: 3h 8m 19s
Pushing bc2112e to main...

@rust-bors rust-bors Bot merged commit bc2112e into rust-lang:main Jun 18, 2026
14 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 18, 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 c55fad5 (parent) -> bc2112e (this PR)

Test differences

Show 91 test diffs

Stage 1

  • [ui] tests/ui/reborrow/generic-reborrow-expr-use-visitor-closure.rs: [missing] -> pass (J0)
  • [ui] tests/ui/reborrow/generic-reborrow-expr-use-visitor.rs: [missing] -> pass (J0)
  • [ui] tests/ui/reborrow/reborrow-source-unsafety.rs: [missing] -> pass (J0)
  • [ui] tests/ui/scalable-vectors/debuginfo-no-opt-llvm-ice.rs: [missing] -> ignore (only executed when the architecture is aarch64) (J0)
  • [ui (polonius)] tests/ui/reborrow/generic-reborrow-expr-use-visitor-closure.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/reborrow/generic-reborrow-expr-use-visitor.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/reborrow/reborrow-source-unsafety.rs: [missing] -> pass (J2)
  • [ui (polonius)] tests/ui/scalable-vectors/debuginfo-no-opt-llvm-ice.rs: [missing] -> ignore (only executed when the architecture is aarch64) (J2)
  • [rustdoc-html] tests/rustdoc-html/jump-to-def/item-with-derive.rs: [missing] -> pass (J3)

Stage 2

  • [ui] tests/ui/reborrow/generic-reborrow-expr-use-visitor-closure.rs: [missing] -> pass (J1)
  • [ui] tests/ui/reborrow/generic-reborrow-expr-use-visitor.rs: [missing] -> pass (J1)
  • [ui] tests/ui/reborrow/reborrow-source-unsafety.rs: [missing] -> pass (J1)
  • [ui] tests/ui/scalable-vectors/debuginfo-no-opt-llvm-ice.rs: [missing] -> pass (J4)
  • [ui] tests/ui/scalable-vectors/debuginfo-no-opt-llvm-ice.rs: [missing] -> ignore (only executed when the architecture is aarch64) (J5)
  • [rustdoc-html] tests/rustdoc-html/jump-to-def/item-with-derive.rs: [missing] -> pass (J6)

Additionally, 76 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 bc2112ed56c99fa649e09ab3ab286afab3d9059a --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. dist-x86_64-solaris: 1h 3m -> 1h 34m (+48.3%)
  2. x86_64-gnu-miri: 1h 39m -> 54m 4s (-45.4%)
  3. dist-aarch64-linux: 1h 49m -> 2h 27m (+34.8%)
  4. dist-x86_64-msvc-alt: 2h 6m -> 2h 45m (+30.7%)
  5. dist-x86_64-llvm-mingw: 2h 3m -> 1h 27m (-29.1%)
  6. i686-msvc-1: 2h 16m -> 2h 55m (+29.1%)
  7. x86_64-gnu-llvm-22-3: 1h 32m -> 1h 56m (+25.4%)
  8. x86_64-gnu-gcc-core-tests: 14m 43s -> 10m 58s (-25.4%)
  9. x86_64-rust-for-linux: 39m 5s -> 49m (+25.4%)
  10. dist-powerpc64le-linux-musl: 1h 54m -> 1h 34m (-17.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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#156795 Handle generic reborrow in expression-use adjustment walking ed5bdf08f1cba1eeed139f4e614eee8d163d78cd (link)
#157694 Enhance documentation on wake call memory ordering 343ce06fa537208628e4618baccd18d4b2ce91b8 (link)
#157935 Make proc_macro::ConversionErrorKind non exhaustive 1101773abbb3e5da93baefde2e22b80f81952f70 (link)
#158002 Replace unwrap with expect in get_module_children 70d120bf343156bc1e7504b3f679ed39d2892321 (link)
#158009 Reject impl const Trait since the right syntax is `const … 27dc08e4251981b744c986c8abbaa604061583d9 (link)
#158034 Fix reborrow source expression visits 03ecc7a3a272fd59465bb16eb6b81f0b16715fc9 (link)
#158072 Bump thin-vec to 0.2.18 to address RUSTSEC-2026-0103 4ca68dcf72f2107e6d3732868ad79bd67544990c (link)
#158074 Document transient connection errors from TcpListener::acce… 801aabff37db31172748bb6ea3bb05ff9a318f06 (link)
#158077 rustdoc-json-types: Replace bincode dev-dependency with pos… 1cdb260b7735a6b5363856861398cceb4ea1687a (link)
#158086 renovate: Loosen dashboard approval and adopt recommended c… 9e6e605d884d244e78e731be1808676ac38e95fb (link)
#158088 codegen_ssa: no dbginfo for scalable vec local w/ -O0 631628ef512619d3916b4138eff46b9db73a6b65 (link)
#158089 Fix invalid "jump-to-def" doc link generation when an item … 2309ec4764d0b5ab5f15160413f14a0b765798f8 (link)

previous master: c55fad5a90

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 (bc2112e): comparison URL.

Overall result: ❌ regressions - 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.3% [0.3%, 0.3%] 1
Regressions ❌
(secondary)
0.2% [0.2%, 0.2%] 5
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.3% [0.3%, 0.3%] 1

Max RSS (memory usage)

Results (primary -4.2%)

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

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 (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.0%] 15
Regressions ❌
(secondary)
0.1% [0.1%, 0.1%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [0.0%, 0.0%] 15

Bootstrap: 481.592s -> 482.188s (0.12%)
Artifact size: 391.21 MiB -> 391.12 MiB (-0.02%)

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

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustdoc-json Area: Rustdoc JSON backend 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. 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. T-rustfmt Relevant to the rustfmt 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.