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.

Sign up for GitHub

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

Jump to bottom

fix(Inference): Consider shunted metas when comparing equality #555

Merged
merged 2 commits into from
Sep 26, 2023
Merged

fix(Inference): Consider shunted metas when comparing equality #555

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b343b1
fix(Inference): Consider shunted metas when comparing equality
croyzor Sep 26, 2023
b43c788
doc: Add a comment from the PR description
croyzor Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/extension/infer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,13 @@ impl UnificationContext {
let solution =
ExtensionSet::from_iter(self.get_constraints(&m).unwrap().iter().filter_map(
|c| match c {
Constraint::Plus(x, other_m) if &m == other_m => Some(x.clone()),
// If `m` has been merged, [`self.variables`] entry
// will have already been updated to the merged
// value by [`self.merge_equal_metas`] so we don't
// need to worry about resolving it.
Constraint::Plus(x, other_m) if m == self.resolve(*other_m) => {
Copy link
Member

Choose a reason for hiding this comment

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

I think the following from the PR description is worth adding as a comment here: " In this case, the variable (LHS) is updated to the merged value in UnificationContext::merge_equal_metas so we don't need to resolve that one."

Some(x.clone())
}
_ => None,
},
));
Expand Down