mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify solution_from_chalk

Browse Source
This commit is contained in:
Florian Diebold 2019-05-01 16:37:52 +02:00
parent b9c0c2abb7
commit 6c3ee834d6
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/ra_hir/src/ty/traits.rs
View File

@ -348,13 +348,13 @@ pub(crate) fn implements(
// relevant for our use cases?)
let u_canonical = chalk_ir::UCanonical { canonical, universes: 1 };
let solution = solve(db, krate, &u_canonical);
solution_from_chalk(db, solution)
solution.map(|solution| solution_from_chalk(db, solution))
}
fn solution_from_chalk(
db: &impl HirDatabase,
solution: Option<chalk_solve::Solution>,
) -> Option<Solution> {
solution: chalk_solve::Solution,
) -> Solution {
let convert_subst = |subst: chalk_ir::Canonical<chalk_ir::Substitution>| {
let value = subst
.value
@ -372,23 +372,22 @@ fn solution_from_chalk(
SolutionVariables(result)
};
match solution {
Some(chalk_solve::Solution::Unique(constr_subst)) => {
chalk_solve::Solution::Unique(constr_subst) => {
let subst = chalk_ir::Canonical {
value: constr_subst.value.subst,
binders: constr_subst.binders,
};
Some(Solution::Unique(convert_subst(subst)))
Solution::Unique(convert_subst(subst))
}
Some(chalk_solve::Solution::Ambig(chalk_solve::Guidance::Definite(subst))) => {
Some(Solution::Ambig(Guidance::Definite(convert_subst(subst))))
chalk_solve::Solution::Ambig(chalk_solve::Guidance::Definite(subst)) => {
Solution::Ambig(Guidance::Definite(convert_subst(subst)))
}
Some(chalk_solve::Solution::Ambig(chalk_solve::Guidance::Suggested(subst))) => {
Some(Solution::Ambig(Guidance::Suggested(convert_subst(subst))))
chalk_solve::Solution::Ambig(chalk_solve::Guidance::Suggested(subst)) => {
Solution::Ambig(Guidance::Suggested(convert_subst(subst)))
}
Some(chalk_solve::Solution::Ambig(chalk_solve::Guidance::Unknown)) => {
Some(Solution::Ambig(Guidance::Unknown))
chalk_solve::Solution::Ambig(chalk_solve::Guidance::Unknown) => {
Solution::Ambig(Guidance::Unknown)
}
None => None,
}
}