language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove SolutionVariables, add ConstrainedSubst analogous to Chalk

Browse source 
... just missing the constraints.
This commit is contained in:
Florian Diebold 2021-04-06 23:46:32 +02:00
parent 31d2b3b9cb
commit b03969cda9
7 changed files with 53 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/hir/src/lib.rs
View file

@ -58,9 +58,8 @@ use hir_ty::{
subst_prefix,
traits::FnTrait,
AliasEq, AliasTy, BoundVar, CallableDefId, CallableSig, Canonical, CanonicalVarKinds, Cast,
DebruijnIndex, InEnvironment, Interner, QuantifiedWhereClause, Scalar, Solution,
SolutionVariables, Substitution, TraitEnvironment, Ty, TyBuilder, TyDefId, TyExt, TyKind,
TyVariableKind, WhereClause,
DebruijnIndex, InEnvironment, Interner, QuantifiedWhereClause, Scalar, Solution, Substitution,
TraitEnvironment, Ty, TyBuilder, TyDefId, TyExt, TyKind, TyVariableKind, WhereClause,
};
use itertools::Itertools;
use rustc_hash::FxHashSet;
@ -1822,8 +1821,9 @@ impl Type {
);
match db.trait_solve(self.krate, goal)? {
Solution::Unique(SolutionVariables(subst)) => subst
Solution::Unique(s) => s
.value
.subst
.interned()
.first()
.map(|ty| self.derived(ty.assert_ty_ref(&Interner).clone())),