---

yaml
---
r: 171515
b: refs/heads/batch
c: f67a722
h: refs/heads/master
i:
  171513: 0c7dc69
  171511: 6bb960a
v: v3

Author: Ericson2314

[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: 9f1ead8fadc56bad30dc74f5cc50d78af4fbc972
+refs/heads/batch: f67a7227b7052608a23d1e324c29f8ec6addf58a
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/src/liballoc/lib.rs

@@ -69,6 +69,8 @@
 
 #[macro_use]
 extern crate core;
+
+#[cfg(all(not(external_funcs), not(external_crate)))]
 extern crate libc;
 
 // Allow testing this library

branches/batch/src/librustc/middle/traits/project.rs

@@ -452,9 +452,7 @@ fn assemble_candidates_from_predicates<'cx,'tcx>(
     for predicate in elaborate_predicates(selcx.tcx(), env_predicates) {
         match predicate {
             ty::Predicate::Projection(ref data) => {
-                let same_name = data.item_name() == obligation.predicate.item_name;
-
-                let is_match = same_name && infcx.probe(|_| {
+                let is_match = infcx.probe(|_| {
                     let origin = infer::Misc(obligation.cause.span);
                     let obligation_poly_trait_ref =
                         obligation_trait_ref.to_poly_trait_ref();
@@ -467,9 +465,6 @@ fn assemble_candidates_from_predicates<'cx,'tcx>(
                 });
 
                 if is_match {
-                    debug!("assemble_candidates_from_predicates: candidate {}",
-                           data.repr(selcx.tcx()));
-
                     candidate_set.vec.push(
                         ProjectionTyCandidate::ParamEnv(data.clone()));
                 }
@@ -532,9 +527,6 @@ fn assemble_candidates_from_impls<'cx,'tcx>(
 
     match vtable {
         super::VtableImpl(data) => {
-            debug!("assemble_candidates_from_impls: impl candidate {}",
-                   data.repr(selcx.tcx()));
-
             candidate_set.vec.push(
                 ProjectionTyCandidate::Impl(data));
         }

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

@@ -1892,10 +1892,6 @@ pub struct ProjectionPredicate<'tcx> {
 pub type PolyProjectionPredicate<'tcx> = Binder<ProjectionPredicate<'tcx>>;
 
 impl<'tcx> PolyProjectionPredicate<'tcx> {
-    pub fn item_name(&self) -> ast::Name {
-        self.0.projection_ty.item_name // safe to skip the binder to access a name
-    }
-
     pub fn sort_key(&self) -> (ast::DefId, ast::Name) {
         self.0.projection_ty.sort_key()
     }