Skip to content

new solver cleanup + implement coherence #109447

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

Merged
bors merged 4 commits into from
Mar 23, 2023
Merged

new solver cleanup + implement coherence #109447

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47f24a8
new solver cleanup + coherence
lcnr Mar 21, 2023
938434a
enable `intercrate` in the solver `InferCtxt`
lcnr Mar 21, 2023
a7ec045
disable global caching during coherence
lcnr Mar 21, 2023
f86b035
woops
lcnr Mar 21, 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
Prev Previous commit
woops
  • Loading branch information
@lcnr
lcnr committed Mar 21, 2023
commit f86b0358f81aa67ff5ca8abf90935226fcab4f40
2 changes: 1 addition & 1 deletion compiler/rustc_middle/src/traits/solve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl Certainty {
(Certainty::Yes, Certainty::Maybe(_)) => other,
(Certainty::Maybe(_), Certainty::Yes) => self,
(Certainty::Maybe(MaybeCause::Ambiguity), Certainty::Maybe(MaybeCause::Ambiguity)) => {
Certainty::Maybe(MaybeCause::Overflow)
Certainty::Maybe(MaybeCause::Ambiguity)
}
(Certainty::Maybe(MaybeCause::Ambiguity), Certainty::Maybe(MaybeCause::Overflow))
| (Certainty::Maybe(MaybeCause::Overflow), Certainty::Maybe(MaybeCause::Ambiguity))
Expand Down