Skip to content

Rollup of 14 pull requests - #163540

Closed
JonathanBrouwer wants to merge 107 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-IgEalS5
Closed

JonathanBrouwer wants to merge 107 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-IgEalS5

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.
…ome` and `record_defaulted` -> `record_value`
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
…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 5c09ea5 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

rust-bors Bot commented Sep 30, 2026 •

Copy link
Copy Markdown
Contributor

⌛ Trying commit 5c09ea5 with merge 3135961…

To cancel the try build, run the command @bors try cancel.

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

rust-bors Bot pushed a commit that referenced this pull request Sep 30, 2026
Rollup of 14 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-log-analyzer

Copy link
Copy Markdown
Collaborator

The job test-aarch64-gnu-llvm-21-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling rustc_mir_dataflow v0.0.0 (/checkout/compiler/rustc_mir_dataflow)
error[E0107]: struct takes 3 generic arguments but 2 generic arguments were supplied
   --> compiler/rustc_metadata/src/rmeta/mod.rs:217:30
    |
217 |     proc_macro_quoted_spans: LazyTable<usize, Option<LazyValue<Span>>>,
    |                              ^^^^^^^^^ -----  ----------------------- supplied 2 generic arguments
    |                              |
    |                              expected 3 generic arguments
    |
note: struct defined here, with 3 generic parameters: `IdxEncode`, `IdxDecode`, `T`
   --> compiler/rustc_metadata/src/rmeta/mod.rs:150:8
    |
150 | struct LazyTable<IdxEncode, IdxDecode, T> {
    |        ^^^^^^^^^ ---------  ---------  -
help: add missing generic argument
    |
217 |     proc_macro_quoted_spans: LazyTable<usize, Option<LazyValue<Span>>, T>,
    |                                                                      +++

error[E0277]: the trait bound `std::option::Option<rmeta::LazyValue<rustc_span::Span>>: Idx` is not satisfied
    --> compiler/rustc_metadata/src/rmeta/encoder.rs:2138:67
     |
2138 |             let proc_macro_quoted_spans = proc_macro_quoted_spans.encode(&mut self.opaque);
     |                                                                   ^^^^^^ the trait `Idx` is not implemented for `std::option::Option<rmeta::LazyValue<rustc_span::Span>>`
     |
     = help: the following other types implement trait `Idx`:
               ArmId
               AttrId
               BasicCoverageBlock
---
             and 33 others
note: required by a bound in `table::TableBuilder::<Ie, Id, T>::encode`
    --> compiler/rustc_metadata/src/rmeta/table.rs:453:19
     |
 453 | impl<Ie: Idx, Id: Idx, const N: usize, T: FixedSizeEncoding<ByteArray = [u8; N]>>
     |                   ^^^ required by this bound in `TableBuilder::<Ie, Id, T>::encode`
...
 484 |     pub(crate) fn encode(&self, buf: &mut FileEncoder<'_>) -> LazyTable<Ie, Id, T> {
     |                   ------ required by a bound in this associated function

error[E0277]: the trait bound `std::option::Option<rmeta::LazyValue<rustc_span::Span>>: Idx` is not satisfied
    --> compiler/rustc_metadata/src/rmeta/encoder.rs:2135:41
     |
2135 |                 proc_macro_quoted_spans.set_some(i, self.lazy(span));
     |                                         ^^^^^^^^ the trait `Idx` is not implemented for `std::option::Option<rmeta::LazyValue<rustc_span::Span>>`
     |
     = help: the following other types implement trait `Idx`:
               ArmId
               AttrId
               BasicCoverageBlock
---
             and 33 others
note: required by a bound in `table::TableBuilder::<Ie, Id, std::option::Option<T>>::set_some`
    --> compiler/rustc_metadata/src/rmeta/table.rs:444:19
     |
 444 | impl<Ie: Idx, Id: Idx, const N: usize, T> TableBuilder<Ie, Id, Option<T>>
     |                   ^^^ required by this bound in `TableBuilder::<Ie, Id, Option<T>>::set_some`
...
 448 |     pub(crate) fn set_some(&mut self, i: Ie, value: T) {
     |                   -------- required by a bound in this associated function

error[E0277]: the trait bound `std::option::Option<rmeta::LazyValue<rustc_span::Span>>: Idx` is not satisfied
    --> compiler/rustc_metadata/src/rmeta/encoder.rs:2133:47
     |
2133 |             let mut proc_macro_quoted_spans = TableBuilder::default();
     |                                               ^^^^^^^^^^^^ the trait `Idx` is not implemented for `std::option::Option<rmeta::LazyValue<rustc_span::Span>>`
     |
     = help: the following other types implement trait `Idx`:
               ArmId
               AttrId
               BasicCoverageBlock
---
             and 33 others
note: required by a bound in `table::TableBuilder`
    --> compiler/rustc_metadata/src/rmeta/table.rs:430:59
     |
 430 | pub(super) struct TableBuilder<IdxEncode: Idx, IdxDecode: Idx, T: FixedSizeEncoding> {
     |                                                           ^^^ required by this bound in `TableBuilder`

Some errors have detailed explanations: E0107, E0277.
For more information about an error, try `rustc --explain E0107`.
[RUSTC-TIMING] rustc_metadata test:false 1.599

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job test-x86_64-gnu-llvm-21-3 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling rustc_mir_dataflow v0.0.0 (/checkout/compiler/rustc_mir_dataflow)
error[E0107]: struct takes 3 generic arguments but 2 generic arguments were supplied
   --> compiler/rustc_metadata/src/rmeta/mod.rs:217:30
    |
217 |     proc_macro_quoted_spans: LazyTable<usize, Option<LazyValue<Span>>>,
    |                              ^^^^^^^^^ -----  ----------------------- supplied 2 generic arguments
    |                              |
    |                              expected 3 generic arguments
    |
note: struct defined here, with 3 generic parameters: `IdxEncode`, `IdxDecode`, `T`
   --> compiler/rustc_metadata/src/rmeta/mod.rs:150:8
    |
150 | struct LazyTable<IdxEncode, IdxDecode, T> {
    |        ^^^^^^^^^ ---------  ---------  -
help: add missing generic argument
    |
217 |     proc_macro_quoted_spans: LazyTable<usize, Option<LazyValue<Span>>, T>,
    |                                                                      +++

error[E0277]: the trait bound `std::option::Option<rmeta::LazyValue<rustc_span::Span>>: Idx` is not satisfied
    --> compiler/rustc_metadata/src/rmeta/encoder.rs:2138:67
     |
2138 |             let proc_macro_quoted_spans = proc_macro_quoted_spans.encode(&mut self.opaque);
     |                                                                   ^^^^^^ the trait `Idx` is not implemented for `std::option::Option<rmeta::LazyValue<rustc_span::Span>>`
     |
     = help: the following other types implement trait `Idx`:
               ArmId
               AttrId
               BasicCoverageBlock
---
             and 33 others
note: required by a bound in `table::TableBuilder::<Ie, Id, T>::encode`
    --> compiler/rustc_metadata/src/rmeta/table.rs:453:19
     |
 453 | impl<Ie: Idx, Id: Idx, const N: usize, T: FixedSizeEncoding<ByteArray = [u8; N]>>
     |                   ^^^ required by this bound in `TableBuilder::<Ie, Id, T>::encode`
...
 484 |     pub(crate) fn encode(&self, buf: &mut FileEncoder<'_>) -> LazyTable<Ie, Id, T> {
     |                   ------ required by a bound in this associated function

error[E0277]: the trait bound `std::option::Option<rmeta::LazyValue<rustc_span::Span>>: Idx` is not satisfied
    --> compiler/rustc_metadata/src/rmeta/encoder.rs:2135:41
     |
2135 |                 proc_macro_quoted_spans.set_some(i, self.lazy(span));
     |                                         ^^^^^^^^ the trait `Idx` is not implemented for `std::option::Option<rmeta::LazyValue<rustc_span::Span>>`
     |
     = help: the following other types implement trait `Idx`:
               ArmId
               AttrId
               BasicCoverageBlock
---
             and 33 others
note: required by a bound in `table::TableBuilder::<Ie, Id, std::option::Option<T>>::set_some`
    --> compiler/rustc_metadata/src/rmeta/table.rs:444:19
     |
 444 | impl<Ie: Idx, Id: Idx, const N: usize, T> TableBuilder<Ie, Id, Option<T>>
     |                   ^^^ required by this bound in `TableBuilder::<Ie, Id, Option<T>>::set_some`
...
 448 |     pub(crate) fn set_some(&mut self, i: Ie, value: T) {
     |                   -------- required by a bound in this associated function

error[E0277]: the trait bound `std::option::Option<rmeta::LazyValue<rustc_span::Span>>: Idx` is not satisfied
    --> compiler/rustc_metadata/src/rmeta/encoder.rs:2133:47
     |
2133 |             let mut proc_macro_quoted_spans = TableBuilder::default();
     |                                               ^^^^^^^^^^^^ the trait `Idx` is not implemented for `std::option::Option<rmeta::LazyValue<rustc_span::Span>>`
     |
     = help: the following other types implement trait `Idx`:
               ArmId
               AttrId
               BasicCoverageBlock
---
             and 33 others
note: required by a bound in `table::TableBuilder`
    --> compiler/rustc_metadata/src/rmeta/table.rs:430:59
     |
 430 | pub(super) struct TableBuilder<IdxEncode: Idx, IdxDecode: Idx, T: FixedSizeEncoding> {
     |                                                           ^^^ required by this bound in `TableBuilder`

Some errors have detailed explanations: E0107, E0277.
For more information about an error, try `rustc --explain E0107`.
[RUSTC-TIMING] rustc_metadata test:false 1.638

@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

PR #162900, which is a member of this rollup, was unapproved.

This rollup was thus unapproved.

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 30, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors try cancel

@rust-bors

rust-bors Bot commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

Try build cancelled. Cancelled workflows:

Hint: if you want to run another try build, you do not need to manually cancel the previous one. Just run @bors try and bors will cancel the previous build automatically.

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