bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix rebase

Browse source
This commit is contained in:
Matthew Jasper 2020-09-06 20:04:52 +01:00
parent 852073a7d2
commit 27534b3932
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_traits/src/chalk/db.rs
View file

@ -77,10 +77,11 @@ impl<'tcx> chalk_solve::RustIrDatabase<RustInterner<'tcx>> for RustIrDatabase<'t
let where_clauses = self.where_clauses_for(def_id, bound_vars);
let bounds = self
.interner
.tcx
.explicit_item_bounds(def_id)
.iter()
.map(|(bound, _)| bound.subst(self.tcx, &bound_vars))
.map(|(bound, _)| bound.subst(self.interner.tcx, &bound_vars))
.filter_map(|bound| {
LowerInto::<
Option<chalk_solve::rust_ir::QuantifiedInlineBound<RustInterner<'tcx>>>,
@ -453,14 +454,19 @@ impl<'tcx> chalk_solve::RustIrDatabase<RustInterner<'tcx>> for RustIrDatabase<'t
let binders = binders_for(&self.interner, bound_vars);
let where_clauses = self.where_clauses_for(opaque_ty_id.0, bound_vars);
let bounds: Vec<_> = predicates
let bounds: Vec<_> = self
.interner
.tcx
.explicit_item_bounds(opaque_ty_id.0)
.iter()
.map(|(bound, _)| bound.subst(self.tcx, &bound_vars))
.filter_map(|bound| LowerInto::<Option<chalk_ir::QuantifiedWhereClause<RustInterner<'tcx>>>>::lower_into(bound, &self.interner))
.map(|(bound, _)| bound.subst(self.interner.tcx, &bound_vars))
.filter_map(|bound| {
LowerInto::<Option<chalk_ir::QuantifiedWhereClause<RustInterner<'tcx>>>>::lower_into(bound, &self.interner)
})
.collect();
let value = chalk_solve::rust_ir::OpaqueTyDatumBound {
bounds: chalk_ir::Binders::new(binders, bounds),
bounds: chalk_ir::Binders::new(binders.clone(), bounds),
where_clauses: chalk_ir::Binders::new(binders, where_clauses),
};