Rollup of 8 pull requests #131768

matthiaskrgr · 2024-10-16T04:08:36Z

Successful merges:

Don't check unsize goal in MIR validation when opaques remain #130989 (Don't check unsize goal in MIR validation when opaques remain)
Delay ambiguous intra-doc link resolution after Cache has been populated #131691 (Delay ambiguous intra-doc link resolution after Cache has been populated)
Try to improve error messages involving aliases in the solver #131699 (Try to improve error messages involving aliases in the solver)
Fix match_same_arms in stable_mir #131700 (Fix match_same_arms in stable_mir)
Refactor some core::fmt macros #131730 (Refactor some core::fmt macros)
cleanup canonical queries #131748 (cleanup canonical queries)
Rename can_coerce to may_coerce, and then structurally resolve correctly in the probe #131751 (Rename can_coerce to may_coerce, and then structurally resolve correctly in the probe)
Don't report bivariance error when nesting a struct with field errors into another struct #131754 (Don't report bivariance error when nesting a struct with field errors into another struct)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…lated

Two macros are exactly the same.

… into another struct

… candiate assembly

…stebank Don't check unsize goal in MIR validation when opaques remain Similarly to `mir_assign_valid_types`, let's just skip when there are opaques. Fixes rust-lang#130921.

…er-out-2, r=notriddle Delay ambiguous intra-doc link resolution after `Cache` has been populated Fixes rust-lang#130233. I was getting nowhere with rust-lang#130278. I took a wrong turn at some point and ended making way too many changes so instead I started again back from 0 and this time it worked out as expected. r? `@notriddle`

…projections, r=lcnr Try to improve error messages involving aliases in the solver 1. Treat aliases as rigid only if it may not be defined and it's well formed (i.e. for projections, its trait goal is satisfied). 2. Record goals that are related to alias normalization under a new `GoalKind`, so we can look into them in the `BestObligation` visitor. 3. Try to deduplicate errors due to self types of goals that are un-normalizable aliases. r? lcnr

…=celinval Fix match_same_arms in stable_mir Hi, This PR fixes some clippy warnings (Reopened rust-lang#131688) ``` warning: this match arm has an identical body to another arm --> compiler/stable_mir/src/mir/visit.rs:197:13 | 197 | / StatementKind::FakeRead(_, place) => { 198 | | self.visit_place(place, PlaceContext::NON_MUTATING, location); 199 | | } | |_____________^ | = help: try changing either arm body = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#match_same_arms help: or try merging the arm patterns | 197 | StatementKind::FakeRead(_, place) | StatementKind::PlaceMention(place) => { | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ help: and remove this obsolete arm | 209 - StatementKind::PlaceMention(place) => { 210 - self.visit_place(place, PlaceContext::NON_MUTATING, location); 211 - } | ``` Best regards, Michal

Refactor some `core::fmt` macros While looking at the macros in `core::fmt`, find that the macros are not well organized. So I created a patch to fix it. [`core/src/fmt/num.rs`](https://github.com/rust-lang/rust/blob/master/library/core/src/fmt/num.rs) * `impl_int!` and `impl_uint!` macro are **completly** same. It would be better to combine for readability * `impl_int!` has a problem that the indenting is not uniform. It has unified into 4 spaces * `debug` macro in `num` renamed to `impl_Debug`, And it was moved to a position close to the `impl_Display`. [`core/src/fmt/float.rs`](https://github.com/rust-lang/rust/blob/master/library/core/src/fmt/float.rs) [`core/src/fmt/nofloat.rs`](https://github.com/rust-lang/rust/blob/master/library/core/src/fmt/nofloat.rs) * `floating` macro now receive multiple idents at once. It makes the code cleaner. * Modified the panic message more clearly in fallback function of `cfg(no_fp_fmt_parse)`

cleanup canonical queries best reviewed commit by commit. adding `CanonicalQueryInput` to stop returning `defining_opaque_types` in query responses is the most involved change here. r? `@compiler-errors`

…ve, r=lcnr Rename `can_coerce` to `may_coerce`, and then structurally resolve correctly in the probe We need to structurally resolve the lhs and rhs of the coercion. Also, renaming the method so it's less ambiguous about what it's doing... the word "may" gives more clear signal that it has false positives imo. r? lcnr

…nce, r=estebank Don't report bivariance error when nesting a struct with field errors into another struct We currently have logic to avoid reporting lifetime bivariance ("lifetime parameter ... is never used") errors when a struct has field resolution errors. However, this doesn't apply transitively. This PR implements a simple visitor to do so. This was reported [here](https://twitter.com/fasterthanlime/status/1846257921086165033) since a `derive(Deserialize, Serialize)` ends up generating helper structs which have bivariant lifetimes due to containing the offending struct (that's being derived on).

matthiaskrgr · 2024-10-16T04:09:14Z

@bors r+ rollup=never p=8

bors · 2024-10-16T04:09:18Z

📌 Commit f69d8db has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-10-16T06:35:36Z

🔒 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-l5j8swn (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-l5j8swn --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

Removing tests/crashes/130921.rs
Auto-merging compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs
CONFLICT (content): Merge conflict in compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs
Auto-merging compiler/rustc_trait_selection/src/traits/outlives_bounds.rs
Auto-merging compiler/rustc_trait_selection/src/solve/fulfill.rs
Auto-merging compiler/rustc_infer/src/infer/mod.rs
Auto-merging compiler/rustc_hir_typeck/src/coercion.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-10-16T07:36:50Z

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

GuillaumeGomez and others added 30 commits October 14, 2024 17:51

Delay ambiguous intra-doc link resolution after Cache has been popu…

73fc00f

…lated

Add regression tests for rust-lang#130233

d540e72

Fix match_same_arms in stable_mir

f708d6d

Combine impl_int and impl_uint

918dc38

Two macros are exactly the same.

Rename debug! macro to impl_Debug!

0637517

Refactor floating macro and nofloat panic message

99af761

Improve documentation for intra-doc links computation

2b9e41c

Remove AmbiguousLinks::disambiguator

10f2395

ImpliedOutlivesBounds to rustc_middle

05dec8f

remove type_op constructors

044ce0c

DropckOutlives to rustc_middle

e457466

remove Canonical::unchecked_rebind, it's unused

a5e280e

move defining_opaque_types out of Canonical

0630c5d

Don't report bivariance error when nesting a struct with field errors…

6888521

… into another struct

bless mir-opt tests

e744e22

Always recurse on predicates in BestObligation

50b8029

Make sure the alias is actually rigid

fd2038d

Be better at reporting alias errors

8528387

Register a dummy candidate for failed structural normalization during…

0ead25c

… candiate assembly

Bless tests

f956dc2

Rename can_coerce to may_coerce

b4e9aad

Don't structurally resolve in may_coerce

e3eba2d

Structurally resolve in may_coerce

9070aba

Don't check unsize goal in MIR validation when opaques remain

c773098

Rollup merge of rust-lang#130989 - compiler-errors:unsize-opaque, r=e…

2acc7ec

…stebank Don't check unsize goal in MIR validation when opaques remain Similarly to `mir_assign_valid_types`, let's just skip when there are opaques. Fixes rust-lang#130921.

Rollup merge of rust-lang#131748 - lcnr:typing-mode, r=compiler-errors

4b43960

cleanup canonical queries best reviewed commit by commit. adding `CanonicalQueryInput` to stop returning `defining_opaque_types` in query responses is the most involved change here. r? `@compiler-errors`

matthiaskrgr added 2 commits October 16, 2024 06:08

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 Oct 16, 2024

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 Oct 16, 2024

matthiaskrgr closed this Oct 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #131768

Rollup of 8 pull requests #131768

matthiaskrgr commented Oct 16, 2024

matthiaskrgr commented Oct 16, 2024

bors commented Oct 16, 2024

bors commented Oct 16, 2024

bors commented Oct 16, 2024

Rollup of 8 pull requests #131768

Rollup of 8 pull requests #131768

Conversation

matthiaskrgr commented Oct 16, 2024

matthiaskrgr commented Oct 16, 2024

bors commented Oct 16, 2024

bors commented Oct 16, 2024

bors commented Oct 16, 2024