Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not consider elaborated projection predicates for objects in new solver #109675

Merged
merged 1 commit into from
Mar 30, 2023

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Mar 27, 2023

Object types have projection bounds which are elaborated during astconv. There's no need to do it again for projection goals, since that'll give us duplicate projection candidatesd that are distinct up to regions due to the fact that we canonicalize every region to a separate variable. See quick example below the break for a better explanation.

Discussed this with lcnr, and adding a stop-gap until we get something like intersection region constraints (or modify canonicalization to canonicalize identical regions to the same canonical regions) -- after which, this will hopefully not matter and may be removed.

r? @lcnr


See tests/ui/traits/new-solver/more-object-bound.rs:

Consider a goal: <dyn Iter<'a, ()> as Iterator>::Item = &'a ().

After canonicalization: <dyn Iter<'!0r, (), Item = '!1r ()> as Iterator>::Item == &!'2r ()

  • First object candidate comes from the item bound in the dyn's bounds itself, giving us <dyn Iter<'!0r, (), Item = '?!r ()> as Iterator>::Item == &!'1r (). This gives us one region constraint: !'1r == !'2r.
  • Second object candidate comes from elaborating the principal trait ref, gives us <dyn Iter<'!0r, (), Item = '!1r ()> as Iterator>::Item == &!'0r (). This gives us one region constraint: !'0r == !'2r.
  • Oops! Ambiguity!

@rustbot 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 Mar 27, 2023
@rustbot
Copy link
Collaborator

rustbot commented Mar 27, 2023

Some changes occurred to the core trait solver

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

Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me after nits

compiler/rustc_trait_selection/src/solve/assembly.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/solve/assembly.rs Outdated Show resolved Hide resolved
@compiler-errors
Copy link
Member Author

@bors r=lcnr rollup (only affects new solver)

@bors
Copy link
Contributor

bors commented Mar 29, 2023

📌 Commit d62238d has been approved by lcnr

It is now in the queue for this repository.

@bors 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 Mar 29, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#107387 (Use random `HashMap` keys on Hermit)
 - rust-lang#109511 (Make `EvalCtxt`'s `infcx` private)
 - rust-lang#109554 (Suggest ..= when someone tries to create an overflowing range)
 - rust-lang#109675 (Do not consider elaborated projection predicates for objects in new solver)
 - rust-lang#109693 (Remove ~const from alloc)
 - rust-lang#109700 (Lint against escape sequences in Fluent files)
 - rust-lang#109716 (Move `mir::Field` → `abi::FieldIdx`)
 - rust-lang#109726 (rustdoc: Don't strip crate module)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 80e988d into rust-lang:master Mar 30, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 30, 2023
@compiler-errors compiler-errors deleted the object-heck branch August 11, 2023 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants