fix: Properly support opaques #20906
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
S-waiting-on-review
ChayimFriedman2
force-pushed
the
opaques-ns
branch
from
d7912ad to
4e6c5c7
Compare
By letting the solver take control of them (reveal them when needed and define them when needed), by providing them in the `TypingMode` plus few helpers.
ChayimFriedman2
force-pushed
the
opaques-ns
branch
from
4e6c5c7 to
537b31b
Compare
|
Fixed the panic, now this can be reviewed. |
| pub(crate) struct InferenceTable<'db> { | ||
| pub(crate) db: &'db dyn HirDatabase, | ||
| pub(crate) trait_env: Arc<TraitEnvironment<'db>>, | ||
| pub(crate) tait_coercion_table: Option<FxHashMap<InternedOpaqueTyId, Ty<'db>>>, |
There was a problem hiding this comment.
I'm really happy that my opaque hack here can be finally removed 🎉
| ); | ||
| } | ||
|
|
||
| #[ignore = "FIXME(next-solver): TAIT support was removed, need to rework it to work with `#[define_opaque]`"] |
| impl<'db> InferenceTable<'db> { | ||
| pub(crate) fn new(db: &'db dyn HirDatabase, trait_env: Arc<TraitEnvironment<'db>>) -> Self { | ||
| /// Inside hir-ty you should use this for inference only, and always pass `owner`. | ||
| /// Outside it, always pass `owner = None`. |
There was a problem hiding this comment.
Expressing this with a new enum type would be great, though it is stated well in the comment and I think this is okay as it is
There was a problem hiding this comment.
I hope this is temporary, since I plan to remove all usages of InferenceTable except inference (its role was to do what InferCtxt does now).
There was a problem hiding this comment.
Yeah, InferenceTable feels quite awkward now 😅
|
I'll add this to the merge queue, as the implementation feels right and is relatively less complex compared to other big next-solver changes 😄 |
rustbot
removed
the
S-waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By letting the solver take control of them (reveal them when needed and define them when needed), by providing them in the
TypingModeplus few helpers.