Rollup of 8 pull requests #137208

matthiaskrgr · 2025-02-18T05:37:43Z

Successful merges:

Future incompatibility warning unsupported_fn_ptr_calling_conventions: Also warn in dependencies #135767 (Future incompatibility warning unsupported_fn_ptr_calling_conventions: Also warn in dependencies)
Make ub_check message clear that it's not an assert #136750 (Make ub_check message clear that it's not an assert)
Do not ignore uninhabited types for function-call ABI purposes. (Remove BackendRepr::Uninhabited) #136985 (Do not ignore uninhabited types for function-call ABI purposes. (Remove BackendRepr::Uninhabited))
Deeply normalize item bounds in new solver #137000 (Deeply normalize item bounds in new solver)
Install more signal stack trace handlers #137151 (Install more signal stack trace handlers)
Organize OsString/OsStr shims #137155 (Organize OsString/OsStr shims)
Pattern Migration 2024: fix incorrect messages/suggestions when errors arise in macro expansions #137161 (Pattern Migration 2024: fix incorrect messages/suggestions when errors arise in macro expansions)
Prune dead regionck code #137183 (Prune dead regionck code)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…l` field in `LayoutData`. Also update comments that refered to BackendRepr::Uninhabited.

…PassMode::Ignore.

…turn ABI as wrapped type.

Add codegen test for uninhabited PassMode::Indirect return types.

* Order items as the average of the two adaptors. Enables easier diffs. * Consistently apply #[inline]. * Implement FromInner<Vec<u8>> for bytes::Buf. * Implement Clone::clone_from for wtf8::Buf.

This was left to only warn in the current crate to give users a chance to update their code. Now for 1.86 we also warn users depending on those crates.

…n via param-env

Co-authored-by: Jubilee <workingjubilee@gmail.com>

…in-deps, r=compiler-errors,traviscross Future incompatibility warning `unsupported_fn_ptr_calling_conventions`: Also warn in dependencies Tracking issue: rust-lang#130260 As discussed [in the previous PR](https://github.com/rust-lang/rust/pull/128784/files#r1752533758) now the future incompatibility warning is enabled in dependencies. The warning was added in 1.83, while this change will get into stable in 1.86, which gives crate authors three versions to fix the warning. r? compiler-errors

Make ub_check message clear that it's not an assert I've seen a user assume that their unsound code was *safe*, because ub_check prevented the program from performing the unsafe operation. This PR makes the panic message clearer that ub_check is a bug detector, not run-time safety protection.

…bited, r=workingjubilee Do not ignore uninhabited types for function-call ABI purposes. (Remove BackendRepr::Uninhabited) Accepted MCP: rust-lang/compiler-team#832 Fixes rust-lang#135802 Do not consider the inhabitedness of a type for function call ABI purposes. * Remove the [`rustc_abi::BackendRepr::Uninhabited`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_abi/enum.BackendRepr.html) variant * Instead calculate the `BackendRepr` of uninhabited types "normally" (as though they were not uninhabited "at the top level", but still considering inhabitedness of variants to determine enum layout, etc) * Add an `uninhabited: bool` field to [`rustc_abi::LayoutData`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_abi/struct.LayoutData.html) so inhabitedness of a `LayoutData` can still be queried when necessary (e.g. when determining if an enum variant needs a tag value allocated to it). This should not affect type layouts (size/align/field offset); this should only affect function call ABI, and only of uninhabited types. cc ``@RalfJung``

…tem-bounds, r=lcnr Deeply normalize item bounds in new solver Built on rust-lang#136863. Fixes rust-lang/trait-system-refactor-initiative#142. Fixes rust-lang/trait-system-refactor-initiative#151. cc rust-lang/trait-system-refactor-initiative#116 First commit reworks candidate preference for projection bounds to prefer param-env projection clauses even if the corresponding trait ref doesn't come from the param-env. Second commit adjusts the associated type item bounds check to deeply normalize in the new solver. This causes some test fallout which I will point out. r? lcnr

…kingjubilee Install more signal stack trace handlers This PR install the signal stack handler to more signals (`SIGILL`, ~~`SIGTRAP`~~, ~~`SIGABRT`~~, ~~`SIGFPE`~~, `SIGBUS`, ~~`SIGQUIT`~~). Noticed in rust-lang#137138 that we didn't print anything for `SIGILL`, so I though we could just handle more signals. r? ``@workingjubilee`` since you last touched it

…Denton Organize `OsString`/`OsStr` shims Synchronize the `bytes.rs` and `wtf8.rs` shims for `OsString`/`OsStr` so they're easier to diff between each other. This is mostly ordering items the same between the two. I tried to minimize moves and went for the average locations between the files. With them in the same order, it is clear that `FromInner<_>` is not implemented for `bytes::Buf` and `Clone::clone_from` is not implemented for `wtf8::Buf`, but they are for the other. Fix that. I added #[inline] to all inherent methods of the `OsString`/`OsStr` shims, because it seemed that was already the rough pattern. `bytes.rs` has more inlining than `wtf8.rs`, so I added the corresponding ones to `wtf8.rs`. Then, the common missing ones have no discernible pattern to me. They're not divided by non-allocating/allocating. Perhaps the pattern is that UTF-8 validation isn't inlined? Since these types are merely the inner values in `OsStr`/`OsString`, I put inline on all methods and let those public types dictate inlining. I have not inspected codegen or run benchmarks. Also, touch up some (private) documentation comments. r? ``@ChrisDenton``

…or-macros, r=Nadrieril Pattern Migration 2024: fix incorrect messages/suggestions when errors arise in macro expansions See the diff between the two commits for how this affected the error message and suggestion. In order to decide how to format those, the pattern migration diagnostic keeps track of which parts of the user's pattern cause problems in Edition 2024. However, it neglected to do some of this bookkeeping when pointing to macro expansion sites. This fixes that.

…, r=lcnr Prune dead regionck code We never encounter `ObligationCauseCode`s that correspond to region obligations that originate from "within" a body, since we don't do HIR regionck anymore on bodies. So prune some dead code.

matthiaskrgr · 2025-02-18T05:38:42Z

@bors r+ rollup=never p=5

bors · 2025-02-18T05:38:45Z

📌 Commit 15d8beb has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-02-18T07:42:46Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-7yzk6a0 (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-7yzk6a0 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_trait_selection/src/error_reporting/traits/suggestions.rs
Auto-merging compiler/rustc_trait_selection/src/error_reporting/infer/nice_region_error/static_impl_trait.rs
CONFLICT (content): Merge conflict in compiler/rustc_trait_selection/src/error_reporting/infer/nice_region_error/static_impl_trait.rs
Auto-merging compiler/rustc_hir_analysis/src/check/compare_impl_item.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2025-02-18T08:46:12Z

☔ The latest upstream changes (presumably #137162) made this pull request unmergeable. Please resolve the merge conflicts.

zachs18 and others added 29 commits February 14, 2025 16:18

Remove BackendRepr::Uninhabited, replaced with an `uninhabited: boo…

e64cbce

…l` field in `LayoutData`. Also update comments that refered to BackendRepr::Uninhabited.

Update ui tests with LayoutData { uninhabited: false }

5af3140

Update ui tests that changed debug output.

1a4c677

Update check to reflect that non-ZST uninhabited types should not be …

3e6972a

…PassMode::Ignore.

Add test that uninhabited repr(transparent) type has same function re…

6e9eadb

…turn ABI as wrapped type.

Fix codegen of uninhabited PassMode::Indirect return types.

bdc321b

Add codegen test for uninhabited PassMode::Indirect return types.

Make ub_check message clear that it's not an assert

ca28827

Improve WTF-8 comments

09dc38f

Simplify control flow with while-let

8b1a3a2

Synchronize platform adaptors for OsString/OsStr

05e4175

* Order items as the average of the two adaptors. Enables easier diffs. * Consistently apply #[inline]. * Implement FromInner<Vec<u8>> for bytes::Buf. * Implement Clone::clone_from for wtf8::Buf.

add a failing test

7af4630

bookkeep properly when pointing into macro expansions

82678df

After introducing the warning in 1.83, now also warn in deps

809858e

This was left to only warn in the current crate to give users a chance to update their code. Now for 1.86 we also warn users depending on those crates.

Bless UI tests

e6d3987

Prefer param-env candidates even when alias's trait bound isn't prove…

2cdb7fa

…n via param-env

Deeply normalize associated type bounds before proving them

b002b5c

Remove UnifyReceiver cause code

7f792dd

More dead code

45edc1c

Even more dead code -- we don't HIR regionck anymore

8d6eca3

Install more signal stack trace handlers

a0a8e02

Adjust LayoutData::uninhabited doc comment.

85fe2b1

Co-authored-by: Jubilee <workingjubilee@gmail.com>

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 18, 2025

bors 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 Feb 18, 2025

bors 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 Feb 18, 2025

matthiaskrgr closed this Feb 18, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #137208

Rollup of 8 pull requests #137208

matthiaskrgr commented Feb 18, 2025

matthiaskrgr commented Feb 18, 2025

bors commented Feb 18, 2025

bors commented Feb 18, 2025

bors commented Feb 18, 2025

Rollup of 8 pull requests #137208

Rollup of 8 pull requests #137208

Conversation

matthiaskrgr commented Feb 18, 2025

matthiaskrgr commented Feb 18, 2025

bors commented Feb 18, 2025

bors commented Feb 18, 2025

bors commented Feb 18, 2025