diff options
author | Florian Diebold <[email protected]> | 2021-04-06 22:46:32 +0100 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2021-04-06 22:46:32 +0100 |
commit | b03969cda92661ad67897fee0ba16c1cc61830ea (patch) | |
tree | 9131d26bacbda364c81ad0ace9d4428b0d8e3c33 /crates/hir/src | |
parent | 31d2b3b9cb75a09c93655b38377ed5f4144ebaf0 (diff) |
Remove `SolutionVariables`, add ConstrainedSubst analogous to Chalk
... just missing the constraints.
Diffstat (limited to 'crates/hir/src')
-rw-r--r-- | crates/hir/src/lib.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 8d00f7401..caa22dace 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs | |||
@@ -58,9 +58,8 @@ use hir_ty::{ | |||
58 | subst_prefix, | 58 | subst_prefix, |
59 | traits::FnTrait, | 59 | traits::FnTrait, |
60 | AliasEq, AliasTy, BoundVar, CallableDefId, CallableSig, Canonical, CanonicalVarKinds, Cast, | 60 | AliasEq, AliasTy, BoundVar, CallableDefId, CallableSig, Canonical, CanonicalVarKinds, Cast, |
61 | DebruijnIndex, InEnvironment, Interner, QuantifiedWhereClause, Scalar, Solution, | 61 | DebruijnIndex, InEnvironment, Interner, QuantifiedWhereClause, Scalar, Solution, Substitution, |
62 | SolutionVariables, Substitution, TraitEnvironment, Ty, TyBuilder, TyDefId, TyExt, TyKind, | 62 | TraitEnvironment, Ty, TyBuilder, TyDefId, TyExt, TyKind, TyVariableKind, WhereClause, |
63 | TyVariableKind, WhereClause, | ||
64 | }; | 63 | }; |
65 | use itertools::Itertools; | 64 | use itertools::Itertools; |
66 | use rustc_hash::FxHashSet; | 65 | use rustc_hash::FxHashSet; |
@@ -1822,8 +1821,9 @@ impl Type { | |||
1822 | ); | 1821 | ); |
1823 | 1822 | ||
1824 | match db.trait_solve(self.krate, goal)? { | 1823 | match db.trait_solve(self.krate, goal)? { |
1825 | Solution::Unique(SolutionVariables(subst)) => subst | 1824 | Solution::Unique(s) => s |
1826 | .value | 1825 | .value |
1826 | .subst | ||
1827 | .interned() | 1827 | .interned() |
1828 | .first() | 1828 | .first() |
1829 | .map(|ty| self.derived(ty.assert_ty_ref(&Interner).clone())), | 1829 | .map(|ty| self.derived(ty.assert_ty_ref(&Interner).clone())), |