---

yaml
---
r: 171239
b: refs/heads/batch
c: 5d6a6f5
h: refs/heads/master
i:
  171237: a876ef5
  171235: 3e2a5bd
  171231: aa82600
v: v3

Author: Jorge Aparicio

[refs]

@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: 799332fa3f968544831ed66e4e32bf331beddbc0
+refs/heads/batch: 5d6a6f59575ab389bb6c2f199e5723923a68ab1d
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/src/librustc/middle/infer/coercion.rs

@@ -71,7 +71,6 @@ use middle::ty::{self, Ty};
 use util::ppaux;
 use util::ppaux::Repr;
 
-use syntax::abi;
 use syntax::ast;
 
 // Note: Coerce is not actually a combiner, in that it does not

branches/batch/src/librustc/middle/ty.rs

@@ -3501,23 +3501,6 @@ pub fn type_contents<'tcx>(cx: &ctxt<'tcx>, ty: Ty<'tcx>) -> TypeContents {
         b | (TC::ReachesBorrowed).when(region != ty::ReStatic)
     }
 
-    fn closure_contents(cty: &ClosureTy) -> TypeContents {
-        // Closure contents are just like trait contents, but with potentially
-        // even more stuff.
-        let st = object_contents(&cty.bounds);
-
-        let st = match cty.store {
-            UniqTraitStore => {
-                st.owned_pointer()
-            }
-            RegionTraitStore(r, mutbl) => {
-                st.reference(borrowed_contents(r, mutbl))
-            }
-        };
-
-        st
-    }
-
     fn object_contents(bounds: &ExistentialBounds) -> TypeContents {
         // These are the type contents of the (opaque) interior. We
         // make no assumptions (other than that it cannot have an