---

yaml
---
r: 233380
b: refs/heads/beta
c: 9c3a866
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 0582fed63fa7207c4694e4c83adbecc46c089a77
+refs/heads/beta: 9c3a8664b6c6ab0e5650166220f870c3a0c2b60b
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/outlives.rs

@@ -122,8 +122,8 @@ fn compute_components<'a,'tcx>(infcx: &InferCtxt<'a,'tcx>,
             }
             ty::TyBareFn(..) | ty::TyTrait(..) => {
                 subtys.skip_current_subtree();
-                let temp = capture_components(infcx, ty);
-                out.push(Component::RFC1214(temp));
+                let subcomponents = capture_components(infcx, ty);
+                out.push(Component::RFC1214(subcomponents));
             }
             ty::TyParam(p) => {
                 out.push(Component::Param(p));
@@ -148,8 +148,8 @@ fn compute_components<'a,'tcx>(infcx: &InferCtxt<'a,'tcx>,
                 } else {
                     // fallback case: continue walking through and
                     // constrain Pi.
-                    let temp = capture_components(infcx, ty);
-                    out.push(Component::EscapingProjection(temp));
+                    let subcomponents = capture_components(infcx, ty);
+                    out.push(Component::EscapingProjection(subcomponents));
                 }
                 subtys.skip_current_subtree();
             }