modify alias-relate to also normalize ambiguous opaques #120549

lcnr · 2024-02-01T12:33:56Z

allows a bunch of further cleanups and generally simplifies the type system. To handle rust-lang/trait-system-refactor-initiative#8 we'll have to add a some additional complexity to the (Alias, Infer) branches in alias-relate, so removing the opaque type special case here is really valuable.

It does worsen deduce_closure_signature and friends even more as they now receive an inference variable which is only constrained via an AliasRelate goal. These probably have to look into alias relate goals somehow. Leaving that for a future PR as this is something we'll have to tackle regardless.

r? @compiler-errors

rustbot · 2024-02-01T12:34:05Z

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

compiler-errors · 2024-02-02T14:57:25Z

compiler/rustc_hir_typeck/src/lib.rs

@@ -302,6 +302,8 @@ fn typeck_with_fallback<'tcx>(

    let typeck_results = fcx.resolve_type_vars_in_body(body);

+    let _ = fcx.infcx.take_opaque_types();


Why? Needs a comment at least.

compiler-errors · 2024-02-02T14:57:45Z

compiler/rustc_hir_typeck/src/writeback.rs

@@ -562,7 +562,9 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {

    #[instrument(skip(self), level = "debug")]
    fn visit_opaque_types(&mut self) {
-        let opaque_types = self.fcx.infcx.take_opaque_types();
+        // We clone the opaques instead of stealing them here as they are still used for


Oh that's why lol

compiler-errors · 2024-02-05T17:49:00Z

@bors r+

bors · 2024-02-05T17:49:03Z

📌 Commit 2adf60c has been approved by compiler-errors

It is now in the queue for this repository.

compiler-errors · 2024-02-05T17:49:07Z

oh new solver

@bors rollup

modify alias-relate to also normalize ambiguous opaques allows a bunch of further cleanups and generally simplifies the type system. To handle rust-lang/trait-system-refactor-initiative#8 we'll have to add a some additional complexity to the `(Alias, Infer)` branches in alias-relate, so removing the opaque type special case here is really valuable. It does worsen `deduce_closure_signature` and friends even more as they now receive an inference variable which is only constrained via an `AliasRelate` goal. These probably have to look into alias relate goals somehow. Leaving that for a future PR as this is something we'll have to tackle regardless. r? `@compiler-errors`

matthiaskrgr · 2024-02-06T17:17:49Z

I suspect that this failed here:
#120710 (comment)

lcnr · 2024-02-08T09:24:49Z

fixed CI

@bors r=compiler-errors

bors · 2024-02-08T09:24:51Z

📌 Commit 45377df has been approved by compiler-errors

It is now in the queue for this repository.

modify alias-relate to also normalize ambiguous opaques allows a bunch of further cleanups and generally simplifies the type system. To handle rust-lang/trait-system-refactor-initiative#8 we'll have to add a some additional complexity to the `(Alias, Infer)` branches in alias-relate, so removing the opaque type special case here is really valuable. It does worsen `deduce_closure_signature` and friends even more as they now receive an inference variable which is only constrained via an `AliasRelate` goal. These probably have to look into alias relate goals somehow. Leaving that for a future PR as this is something we'll have to tackle regardless. r? `@compiler-errors`

modify alias-relate to also normalize ambiguous opaques allows a bunch of further cleanups and generally simplifies the type system. To handle rust-lang/trait-system-refactor-initiative#8 we'll have to add a some additional complexity to the `(Alias, Infer)` branches in alias-relate, so removing the opaque type special case here is really valuable. It does worsen `deduce_closure_signature` and friends even more as they now receive an inference variable which is only constrained via an `AliasRelate` goal. These probably have to look into alias relate goals somehow. Leaving that for a future PR as this is something we'll have to tackle regardless. r? ``@compiler-errors``

matthiaskrgr · 2024-02-08T17:31:30Z

@bors r-
may need rebase #120795 (comment)

bors · 2024-02-08T21:00:01Z

📌 Commit 89e8cc9 has been approved by compiler-errors

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#120584 (For a rigid projection, recursively look at the self type's item bounds to fix the `associated_type_bounds` feature) - rust-lang#120589 (std::thread::available_parallelism merging linux/android/freebsd version) - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages) - rust-lang#120629 (Move some test files) - rust-lang#120846 (Update jobserver-rs to 0.1.28) - rust-lang#120850 (ast_lowering: Fix regression in `use ::{}` imports.) - rust-lang#120853 (Avoid a collection and iteration on empty passes) Failed merges: - rust-lang#120549 (modify alias-relate to also normalize ambiguous opaques) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-02-09T23:56:01Z

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

with this, alias-relate treats all aliases the same way and it can be used for structural normalization.

lcnr · 2024-02-13T04:09:09Z

@rustbot ready

lcnr · 2024-02-13T16:24:06Z

@bors r=compiler-errors

bors · 2024-02-13T16:24:08Z

📌 Commit 51a1000 has been approved by compiler-errors

It is now in the queue for this repository.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#114877 (unstable-book: add quick-edit link) - rust-lang#120548 (rustdoc: Fix handling of doc_auto_cfg feature for cfg attributes on glob reexport) - rust-lang#120549 (modify alias-relate to also normalize ambiguous opaques) - rust-lang#120959 (Remove good path delayed bugs) - rust-lang#120978 (match lowering: simplify block creation) - rust-lang#121019 (coverage: Simplify some parts of the coverage span refiner) - rust-lang#121021 (Extend intra-doc link chapter in the rustdoc book) - rust-lang#121031 (RustWrapper: adapt for coverage mapping API changes) Failed merges: - rust-lang#121014 (Remove `force_print_diagnostic`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#120549 - lcnr:errs-showcase, r=compiler-errors modify alias-relate to also normalize ambiguous opaques allows a bunch of further cleanups and generally simplifies the type system. To handle rust-lang/trait-system-refactor-initiative#8 we'll have to add a some additional complexity to the `(Alias, Infer)` branches in alias-relate, so removing the opaque type special case here is really valuable. It does worsen `deduce_closure_signature` and friends even more as they now receive an inference variable which is only constrained via an `AliasRelate` goal. These probably have to look into alias relate goals somehow. Leaving that for a future PR as this is something we'll have to tackle regardless. r? `@compiler-errors`

…lcnr No need to `validate_alias_bound_self_from_param_env` in `assemble_alias_bound_candidates` We already fully normalize the self type before we reach `assemble_alias_bound_candidates`, so there's no reason to double check that a projection is truly rigid by checking param-env bounds. I think this is also blocked on us making sure to always normalize opaques: rust-lang#120549. r? lcnr

Rollup merge of rust-lang#120598 - compiler-errors:no-rigid-check, r=lcnr No need to `validate_alias_bound_self_from_param_env` in `assemble_alias_bound_candidates` We already fully normalize the self type before we reach `assemble_alias_bound_candidates`, so there's no reason to double check that a projection is truly rigid by checking param-env bounds. I think this is also blocked on us making sure to always normalize opaques: rust-lang#120549. r? lcnr

rustbot assigned compiler-errors Feb 1, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Feb 1, 2024

lcnr force-pushed the errs-showcase branch 3 times, most recently from a9cdad2 to 80218a5 Compare February 1, 2024 12:42

This comment has been minimized.

Sign in to view

lcnr force-pushed the errs-showcase branch from 80218a5 to 2adf60c Compare February 2, 2024 08:53

compiler-errors reviewed Feb 2, 2024

View reviewed changes

compiler-errors mentioned this pull request Feb 3, 2024

No need to validate_alias_bound_self_from_param_env in assemble_alias_bound_candidates #120598

Merged

compiler-errors approved these changes Feb 5, 2024

View reviewed changes

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 5, 2024

matthiaskrgr mentioned this pull request Feb 6, 2024

Rollup of 10 pull requests #120710

Closed

traviscross mentioned this pull request Feb 7, 2024

Decision on "must define before use" for opaque types #117866

Open

lcnr force-pushed the errs-showcase branch from 2adf60c to 45377df Compare February 8, 2024 09:20

matthiaskrgr mentioned this pull request Feb 8, 2024

Rollup of 9 pull requests #120794

Closed

matthiaskrgr mentioned this pull request Feb 8, 2024

Rollup of 10 pull requests #120795

Closed

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 8, 2024

matthiaskrgr mentioned this pull request Feb 9, 2024

Rollup of 7 pull requests #120861

Closed

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 9, 2024

lcnr added 4 commits February 13, 2024 04:47

also try to normalize opaque types in alias-relate

bbe2f6c

with this, alias-relate treats all aliases the same way and it can be used for structural normalization.

use alias-relate to structurally normalize in the solver

3e3e207

add revisions

e5541cf

one must imagine ci happy

51a1000

lcnr force-pushed the errs-showcase branch from 89e8cc9 to 51a1000 Compare February 13, 2024 04:08

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 13, 2024

lcnr mentioned this pull request Feb 13, 2024

avoid generalization inside of aliases #119106

Merged

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 13, 2024

matthiaskrgr mentioned this pull request Feb 13, 2024

Rollup of 8 pull requests #121036

Merged

bors merged commit 65ab663 into rust-lang:master Feb 13, 2024
11 checks passed

rustbot added this to the 1.78.0 milestone Feb 13, 2024

lcnr deleted the errs-showcase branch February 13, 2024 21:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

modify alias-relate to also normalize ambiguous opaques #120549

modify alias-relate to also normalize ambiguous opaques #120549

lcnr commented Feb 1, 2024 •

edited

Loading

rustbot commented Feb 1, 2024

This comment has been minimized.

compiler-errors Feb 2, 2024

compiler-errors Feb 2, 2024

compiler-errors commented Feb 5, 2024

bors commented Feb 5, 2024

compiler-errors commented Feb 5, 2024

matthiaskrgr commented Feb 6, 2024

lcnr commented Feb 8, 2024

bors commented Feb 8, 2024

matthiaskrgr commented Feb 8, 2024

bors commented Feb 8, 2024

bors commented Feb 9, 2024

lcnr commented Feb 13, 2024

lcnr commented Feb 13, 2024

bors commented Feb 13, 2024

		@@ -302,6 +302,8 @@ fn typeck_with_fallback<'tcx>(

		let typeck_results = fcx.resolve_type_vars_in_body(body);

		let _ = fcx.infcx.take_opaque_types();

modify alias-relate to also normalize ambiguous opaques #120549

modify alias-relate to also normalize ambiguous opaques #120549

Conversation

lcnr commented Feb 1, 2024 • edited Loading

rustbot commented Feb 1, 2024

This comment has been minimized.

compiler-errors Feb 2, 2024

Choose a reason for hiding this comment

compiler-errors Feb 2, 2024

Choose a reason for hiding this comment

compiler-errors commented Feb 5, 2024

bors commented Feb 5, 2024

compiler-errors commented Feb 5, 2024

matthiaskrgr commented Feb 6, 2024

lcnr commented Feb 8, 2024

bors commented Feb 8, 2024

matthiaskrgr commented Feb 8, 2024

bors commented Feb 8, 2024

bors commented Feb 9, 2024

lcnr commented Feb 13, 2024

lcnr commented Feb 13, 2024

bors commented Feb 13, 2024

lcnr commented Feb 1, 2024 •

edited

Loading