language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use QuantifiedWhereClause in generic_predicates as well

Browse source 
Still far too much binder skipping going on; I find it hard to imagine
this is all correct, but the tests pass.
This commit is contained in:
Florian Diebold 2021-03-21 17:40:14 +01:00
parent 590c416359
commit 1d5c4a77fb
9 changed files with 28 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/hir_ty/src/lib.rs
View file

@ -518,6 +518,10 @@ impl<T> Binders<T> {
pub fn skip_binders(&self) -> &T {
&self.value
}
pub fn into_value_and_skipped_binders(self) -> (T, usize) {
(self.value, self.num_binders)
}
}
impl<T: Clone> Binders<&T> {
@ -985,7 +989,7 @@ impl Ty {
.generic_predicates(id.parent)
.into_iter()
.map(|pred| pred.clone().subst(&substs))
.filter(|wc| match &wc {
.filter(|wc| match &wc.skip_binders() {
WhereClause::Implemented(tr) => tr.self_type_parameter() == self,
WhereClause::AliasEq(AliasEq {
alias: AliasTy::Projection(proj),
@ -993,7 +997,6 @@ impl Ty {
}) => proj.self_type_parameter() == self,
_ => false,
})
.map(Binders::wrap_empty)
.collect_vec();
Some(predicates)