Skip to content

Rollup of 29 pull requests - #160493

Open
Kobzol wants to merge 79 commits into
rust-lang:mainfrom
Kobzol:rollup-gSPQQor
Open

Rollup of 29 pull requests#160493
Kobzol wants to merge 79 commits into
rust-lang:mainfrom
Kobzol:rollup-gSPQQor

Conversation

@Kobzol

@Kobzol Kobzol commented Aug 4, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

chirizxc and others added 30 commits July 11, 2026 14:27
Signed-off-by: Amirhossein Akhlaghpour <m9.akhlaghpoor@gmail.com>
Co-authored-by: Clar Fon <15850505+clarfonthey@users.noreply.github.com>
```
error[E0277]: the trait bound `needs_borrow::Hello: needs_borrow::Tr` is not satisfied
  --> $DIR/ownership-mismatch-on-arg.rs:42:13
   |
LL |             foo(hi, hi, hi);
   |             ^^^ --  -- `needs_borrow::Hello` doesn't satisfy the trait bound
   |             |   |
   |             |   `needs_borrow::Hello` doesn't satisfy the trait bound
   |             unsatisfied trait bound
   |
help: the trait `needs_borrow::Tr` is not implemented for `needs_borrow::Hello`
  --> $DIR/ownership-mismatch-on-arg.rs:27:5
   |
LL |     struct Hello;
   |     ^^^^^^^^^^^^
help: the trait `needs_borrow::Tr` is implemented for `&needs_borrow::Hello`
  --> $DIR/ownership-mismatch-on-arg.rs:30:5
   |
LL |     impl Tr for &Hello {}
   |     ^^^^^^^^^^^^^^^^^^
note: required by a bound in `needs_borrow::foo`
  --> $DIR/ownership-mismatch-on-arg.rs:32:15
   |
LL |     fn foo<T: Tr, K: std::fmt::Debug>(_v: T, _w: T, _k: K) {}
   |               ^^ required by this bound in `foo`
help: consider borrowing these argument
   |
LL |             foo(&hi, &hi, hi);
   |                 +    +
```
The linux kernel still uses fentry for x86 and s390x arches.
s390x depends entirely on the compiler to record and nop
these sections.

This facilitates support for inserting nop's and/or recording the
location of each mcount call in a special section named `__mcount_loc`.

These attributes are currently only supported with fentry on the s390x
target, otherwise they are quietly ignored (except on s390x).
* fix borrowck ICE for consts with fn pointer type

annotate_argument_and_return_for_borrow called tcx.fn_sig on the item being
checked whenever its type was FnDef or FnPtr. for a const whose type is a fn
pointer that's not a function item, so we ICE'd with "unexpected sort of node
in fn_sig". take the signature from the fn ptr type instead and skip the
annotation when there's no fn decl.
* run rustfmt and refmt
* fix borrowck ICE for consts with fn pointer type

annotate_argument_and_return_for_borrow called tcx.fn_sig on the item being
checked whenever its type was FnDef or FnPtr. for a const whose type is a fn
pointer that's not a function item, so we ICE'd with "unexpected sort of node
in fn_sig". take the signature from the fn ptr type instead and skip the
annotation when there's no fn decl.
* edit comment
* use ty.fn_sig per review
Kobzol added 12 commits August 4, 2026 11:10
…k, r=folkertdev

Linkify C-SKY targets in `platform-support.md`

Targets with dedicated pages are linked, so the C-SKY ones should be too.
fix borrowck ICE for consts with fn pointer type

`borrowck`'s `annotate_argument_and_return_for_borrow` called `tcx.fn_sig` on the item being checked whenever its type was a `fn def` or `fn ptr`. For a const like `const A: fn()`, that asks for the signature of the const itself, which is not a function item, so we ICE'd with `"unexpected sort of node in fn_sig"`.

Now we take the signature from the `fn ptr` type instead and skip the annotation when there's no `fn decl` to annotate.

also added a regression test under `tests/ui/borrowck`.

fixes: rust-lang#160255
ElaborateBoxDeref: remove unnecessary projection

r? @oli-obk
Add regression test for supertrait associated type normalization through dyn

Closes rust-lang#61083. Adds a check pass regression test. couldn't find existing coverage for this case
…act-unused-parens, r=JohnTitor

Add regression test for unused_parens on contract clauses

Fixes rust-lang#143754

This issue is fixed by the parens->brace delimiter change in rust-lang#144438
… r=Mark-Simulacrum

Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`

When fingers really want to type `read_exact`, that naturally leads to
the typo `read_exact_buf` instead of `read_buf_exact`, and
`read_exact_buf_at` instead of `read_buf_exact_at`.

Add doc aliases.

These will help people find them in rustdoc, and once
rust-lang#160369 goes in, it'll also help
people find them as rustfix suggestions.
…, r=Kobzol

Add PR body notes for Cargo lock file maintenance

r? @Kobzol
…/check_rustc_must_implement_one_of, r=JonathanBrouwer

Move duplicate-names check for #[rustc_must_implement_one_of] to attribute parser

Part of rust-lang#131229 which is the parent issue of rust-lang#153101
…lacrum

Run try builds on EC2 by default

This PR switches try builds to EC2 instances by default, while still giving us the option to do a try build on codebuild.

x64 Linux auto jobs are still using CodeBuild, for now.

This script can be used to test the configuration of the generated CI jobs locally:

```bash
#!/bin/bash

#export GITHUB_EVENT_NAME=pull_request
#export GITHUB_REF=refs/heads/pr/1
export GITHUB_EVENT_NAME=push
export GITHUB_REF=refs/heads/automation/bors/try
#export GITHUB_REF=refs/heads/automation/bors/auto

#export COMMIT_MESSAGE="try-job: dist-x86_64-linux-quick"
export COMMIT_MESSAGE="msg"
export GITHUB_RUN_ID=123
export GITHUB_RUN_ATTEMPT=1

cargo run --manifest-path src/ci/citool/Cargo.toml calculate-job-matrix
```

CI runs:
- `@bors try` - rust-lang#160427 (comment) (59m)
- `@bors try jobs=dist-x86_64-linux-quick`: rust-lang#160427 (comment) (1h 32m)
- `@bors try jobs=dist-x86_64-linux-codebuild`: rust-lang#160427 (comment) (3h 6m)
- `@bors try jobs=dist-x86_64-linux`: rust-lang#160427 (comment) (3h 6m)

r? @Mark-Simulacrum
bump tracing-tree

This removes the timestamps from the trace which apparently are meant to be turned off by default but that was buggy in old versions of tracing-trees.

r? @oli-obk
…trochenkov

Fix lookup of object files

I broke this in rust-lang#158823. I wanted to optimize the potentially O(n^2) object file lookup, but didn't realize that we have to search all search paths here, not only files that we already prefiltered for the lib prefixes.

r? @petrochenkov

Fixes: rust-lang#160446
…g, r=jhpratt

Update the tracking issue for `borrowed_buf_init`

This used the same tracking issue as `read_buf`, which is likely to stabilize in the near future without this portion of the API.

Previous issue: rust-lang#78485
New issue: rust-lang#160476
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 4, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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. labels Aug 4, 2026
@Kobzol

Kobzol commented Aug 4, 2026

Copy link
Copy Markdown
Member Author

@bors r+ p=10 note="Rollup including a Docker pull change, hoping to fix CI"

@rust-bors

rust-bors Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

📌 Commit ddfdec8 has been approved by Kobzol

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 Aug 4, 2026
@rust-bors

rust-bors Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

⌛ Testing commit ddfdec8 with merge 0b63def...

Workflow: https://github.com/rust-lang/rust/actions/runs/30895228690

rust-bors Bot pushed a commit that referenced this pull request Aug 4, 2026
Rollup of 29 pull requests

Successful merges:

 - #153749 (Account for ownership mismatch on argument that doesn't meet bound)
 - #159130 (a bit optimize four-digit chunks in integer formatting)
 - #159326 (Deny multiple EII impls on a single item)
 - #159535 (Optimize slice::contains for bytewise types)
 - #159595 (Promote loongarch32-unknown-none* to Tier 2)
 - #160184 (Add -Zinstrument-mcount={fentry-nop-record,fentry-record})
 - #160320 (point at trait definition when it is used as a derive macro)
 - #160369 (When suggesting method names, prefer *exact* doc aliases over similar names)
 - #160406 (`DepKind` cleanups)
 - #160424 (Use `thread::available_parallelism` as the default limit for backend parallelism)
 - #160434 (Avoid Docker push when the image did not change)
 - #159303 (Fix ICE for direct inline const generic defaults)
 - #159977 (Add regression test for bool indexing codegen)
 - #160011 (remove InterpError::map_err_info)
 - #160165 (reject `...` without pattern post-expansion)
 - #160172 (tests: Enable `feature(stmt_expr_attributes)` in `2229_closure_analysis` tests)
 - #160295 (Fix rustdoc ICE when checking if a generic arg can be elided)
 - #160305 (Linkify C-SKY targets in `platform-support.md`)
 - #160314 (fix borrowck ICE for consts with fn pointer type)
 - #160322 (ElaborateBoxDeref: remove unnecessary projection)
 - #160338 (Add regression test for supertrait associated type normalization through dyn)
 - #160340 (Add regression test for unused_parens on contract clauses)
 - #160371 (Add doc aliases for transpositions `read_exact_buf` and `read_exact_buf_at`)
 - #160384 (Add PR body notes for Cargo lock file maintenance)
 - #160412 (Move duplicate-names check for #[rustc_must_implement_one_of] to attribute parser)
 - #160427 (Run try builds on EC2 by default)
 - #160435 (bump tracing-tree)
 - #160449 (Fix lookup of object files)
 - #160477 (Update the tracking issue for `borrowed_buf_init`)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.