Skip to content

Rollup of 13 pull requests - #163542

Closed
JonathanBrouwer wants to merge 103 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-QWunsjo
Closed

JonathanBrouwer wants to merge 103 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-QWunsjo

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

bjorn3 and others added 30 commits September 15, 2026 14:31
This updates the rust-toolchain.toml file to nightly-2026-09-18.
Update `rustup.sh` to use `rustc-josh-sync`
as emitted by the `_mm256_clmulepi64_epi128` and ` _mm512_clmulepi64_epi128` intrinsics
Integrate `stdarch` tests for aarch64
This updates the rust-toolchain.toml file to nightly-2026-09-22.
This updates the rust-toolchain.toml file to nightly-2026-09-23 (6bb1652).
This updates the rust-version file to 3670d25.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Previous upstream ref: rust-lang/rust@88638df
New upstream ref: rust-lang/rust@3670d25
Filtered ref: rust-lang/miri@40409ba
Upstream diff: rust-lang/rust@88638df...3670d25

This merge was created using https://github.com/rust-lang/josh-sync.
Adding tests addressing the changes in
coretests/tests/num/clamp_magnitude.rs
This updates the rust-version file to 0d38a84.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Previous upstream ref: rust-lang/rust@3670d25
New upstream ref: rust-lang/rust@0d38a84
Filtered ref: rust-lang/miri@d0cef69
Upstream diff: rust-lang/rust@3670d25...0d38a84

This merge was created using https://github.com/rust-lang/josh-sync.
Adding mod clamp_magnitude in coretests/num/mod.rs
Activating feature(clamp_magnitude) in coretests/lib.rs
Adding test coverage for f16, f128, and NaN as well as zero cases
Modifying nonzero and int_macros documentation for better readablity
…s-zed

Disable rust-analyzer diagnostics for Zed
Shimmed TCP sockets are now always backed by a host socket. Before
`connect` or `listen` is invoked on the shimmed socket, we just have a
`socket2::Socket`. This is socket is then coverted to a `mio::TcpStream`
or `mio::TcpListener` after encountering a `connect` or `listen`,
respectively.

Furthermore, a socket can always be viewed as a `socket2::SockRef`. This
allows us to support more socket options than mio provides on its TCP
socket abstractions.
…-limit, r=Darksonn

const and NonZero impl for clamp_magnitude()

This PR is implementing the latest proposed changes in Issue rust-lang#148519, making the clamp_magnitude() functions const for all floating point and integer types, as well as adding a clamp_magnitude() to NonZero<$Int>, taking a NonZero<$UInt> as limit parameter.
…bjorn3

Don't use the metadata based crate_hash for rustdoc runs

When a metrics dir is provided for a rustdoc invocation, the crate hash is used to generate the file name for the metrics. Prior to this change, `tcx.needs_metadata()` mistakenly returned true, so the crate_hash query would attempt to read the SVH created as a side effect of the metadata generation. Since metadata is not generated for rustdoc, that SVH was not present, which triggered the ICE. This PR marks `tcx.needs_metadata()` as false for rustdoc runs, which causes the crate_hash query to use the fallback HIR based hash.

One caveat: rust-lang#154724 made the HIR based hash simpler under the assumption that it would only be used for things like dylibs. Specifically, it removed resolutions.visibilities_for_hashing, debugger_visualizers and source_file_names. The latter two are irrelevant for rustdoc, but the first is potentially relevant. However, the hash only has to change when the metrics output it names would change, and the output it names is a list of enabled features, which visibility can't affect.

LLM: Claude was used to generate the tests that reproduce the issue.

Fixes: rust-lang#163426

Regression introduced in rust-lang#154724
Related to rust-lang#94878
Don't build format string suggestions from `concat!` offsets

Fixes rust-lang#156101

When a format string does not come directly from a string literal in
the source, e.g. when it is produced by `concat!`, the parser's inner
offsets are relative to the expanded string rather than to the source.
The primary error span and the `RemoveRawIdent` suggestion already
check `is_source_literal` before calling `fmt_span.from_inner`, but the
`UsePositional`, `ReorderFormatParameter` and `AddMissingColon`
suggestions did not.

As a result, these suggestions could point into the middle of a
multibyte character and ICE when rendered, or suggest a bogus argument
copied from unrelated source text. Only emit them when the format
string is a source literal, like the other suggestions do.

For example, before this change `UsePositional` took `at!` from the
`concat!` invocation as the captured argument, replaced it with `0`,
and suggested passing `at!` as an argument:

```
help: consider using a positional formatting argument instead
  |
2 -     format_args!(concat!("{}{a.b}", ""));
2 +     format_args!(conc0("{}{a.b}", ""), at!);
```

The crash test is moved to `tests/ui/fmt`, with cases covering each of
these suggestions.
… r=JonathanBrouwer

Miscellaneous attr error stuff

Some small improvements I made while working on something bigger (that didn't work out). Details in individual commits.

r? @JonathanBrouwer
…r=oli-obk

x86 and x86_64: cleanup some callconv code

Some cleanup work in the x86 and x86_64 callconv code. The x86 portion is in preparation for `-Zregparam`, cc

- rust-lang#131749
- rust-lang#161027

Best reviewed commit-by-commit.

There should be no functional changes.
…h726

cycle handling: mirror old solver

I hate other people being right :<

When stabilizing the new solver, we really want to minimize the amount of things we're stabilizing. This far more closely matches the old solver while still being somewhat principled. I do think the approach we had before this PR is closer to the final state we want, but I am far from confident that this is the case and this gives us more room to experiment until then.

The rules are as follows: a cycle is coinductive if there's at least one "coinductive trait goal" involved and the only other involved goals are `Projection` goals.

r? types cc @jackh726
Use more default field values in `Resolver`

Minor clean up by adding a way to construct `const FxIndexSet`/`Map`s and then using that in `Resolver`'s default fields.

r? @petrochenkov
…ctor, r=mejrs

Forbid  `Reborrow` impls for types with destructors

Construction of such types should never be so implicit.

Tracking issue: rust-lang#145612

cc @aapoalas

@rustbot label F-reborrow A-destructors
Cast cleanups

At one point I was looking at merging `ast::IntTy` and `ast::UintTy` into a single type. In the end I decided against that, but I did find some related code, mostly involving casts, that deserved some cleanups. Details in individual commits.

r? @oli-obk
…, r=Zalathar

Document `Result` case for the `arena_cache` query modifier

r? @Zalathar
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Sep 30, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-run-make Area: port run-make Makefiles to rmake.rs 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-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Sep 30, 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-gnu-llvm-21-3,test-x86_64-msvc-1,test-aarch64-apple-1,test-aarch64-apple-2,test-x86_64-mingw-1,test-i686-msvc,test-armhf-gnu

@rust-bors

rust-bors Bot commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 1ed7e66 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 Sep 30, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Sep 30, 2026
Rollup of 13 pull requests


try-job: dist-various-1
try-job: test-various
try-job: test-x86_64-gnu-aux
try-job: test-x86_64-gnu-llvm-21-3
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
@rust-bors

rust-bors Bot commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: abafa0c (abafa0cbf324a9865b47632a2153e1fbf79880cb)
Base parent: 7d2cd0f (7d2cd0fbc092625ea371da704f15f80216d2220e)

@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 30, 2026
@rust-bors

rust-bors Bot commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

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

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-run-make Area: port run-make Makefiles to rmake.rs rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-clippy Relevant to the Clippy team. 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-release Relevant to the release subteam, 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.