bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

traits: prefer ClosureSubsts to InferCtxt::closure_kind

Browse source
This commit is contained in:
Niko Matsakis 2017-11-08 08:52:24 -05:00
parent decf3d33d0
commit 716f75b1b8
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/traits/fulfill.rs
View file

@ -438,8 +438,8 @@ fn process_predicate<'a, 'gcx, 'tcx>(
}
}
ty::Predicate::ClosureKind(closure_def_id, _closure_substs, kind) => {
match selcx.infcx().closure_kind(closure_def_id) {
ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind) => {
match closure_substs.opt_closure_kind(closure_def_id, selcx.tcx()) {
Some(closure_kind) => {
if closure_kind.extends(kind) {
Ok(Some(vec![]))

4
src/librustc/traits/select.rs
View file

@ -718,8 +718,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
}
}
ty::Predicate::ClosureKind(closure_def_id, _closure_substs, kind) => {
match self.infcx.closure_kind(closure_def_id) {
ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind) => {
match closure_substs.opt_closure_kind(closure_def_id, self.tcx()) {
Some(closure_kind) => {
if closure_kind.extends(kind) {
EvaluatedToOk