---

yaml
---
r: 227319
b: refs/heads/auto
c: 9c3a866
h: refs/heads/master
i:
  227317: 8c4d3d2
  227315: e7044cc
  227311: fd9357c
v: v3

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 0582fed63fa7207c4694e4c83adbecc46c089a77
+refs/heads/auto: 9c3a8664b6c6ab0e5650166220f870c3a0c2b60b
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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();
             }