From 716f75b1b84e6f615b4ab80965dfa9a2fc566a31 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Wed, 8 Nov 2017 08:52:24 -0500
Subject: [PATCH] traits: prefer `ClosureSubsts` to `InferCtxt::closure_kind`

---
 src/librustc/traits/fulfill.rs | 4 ++--
 src/librustc/traits/select.rs  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/librustc/traits/fulfill.rs b/src/librustc/traits/fulfill.rs
index 0dbf7a6a1f0..1595679e9eb 100644
--- a/src/librustc/traits/fulfill.rs
+++ b/src/librustc/traits/fulfill.rs
@@ -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![]))
diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs
index a0d51101d78..2ab44b9c8bb 100644
--- a/src/librustc/traits/select.rs
+++ b/src/librustc/traits/select.rs
@@ -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