traits: prefer `ClosureSubsts` to `InferCtxt::closure_kind`

716f75b1 · Niko Matsakis · decf3d33 · 716f75b1 · 716f75b1
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

src/librustc/traits/fulfill.rs src/librustc/traits/fulfill.rs +2 -2

src/librustc/traits/select.rs src/librustc/traits/select.rs +2 -2

未找到文件。
--- 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![]))

--- a/src/librustc/traits/select.rs
+++ b/src/librustc/traits/select.rs
@@ -718,8 +718,8 @@ fn evaluate_predicate_recursively<'o>(&mut self,
                }
            }

-            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