rollup merge of #20594: nikomatsakis/orphan-ordered

Conflicts:
	src/libsyntax/feature_gate.rs

diff --cc src/libcore/borrow.rs
Simple merge

diff --cc src/librustc/lint/builtin.rs
Simple merge

diff --cc src/librustc/middle/traits/coherence.rs
Simple merge

diff --cc src/librustc_typeck/check/callee.rs
Simple merge

diff --cc src/librustc_typeck/coherence/orphan.rs
index d90bfe04ea1e78ceaa700c888b7a604a2e21f71e,dc22fd597e68938b707d84a903c5217d421c2614..77d71e740d681f8c626bc173e1139b8e87cca468
--- 1/src/librustc_typeck/coherence/orphan.rs
--- 2/src/librustc_typeck/coherence/orphan.rs
+++ b/src/librustc_typeck/coherence/orphan.rs
@@@ -69,9 -69,10 +69,10 @@@ impl<'cx, 'tcx,'v> visit::Visitor<'v> f
                      }
                  }
              }
 -            ast::ItemImpl(_, _, Some(_), _, _) => {
 +            ast::ItemImpl(_, _, _, Some(_), _, _) => {
                  // "Trait" impl
                  debug!("coherence2::orphan check: trait impl {}", item.repr(self.tcx));
+                 let trait_def_id = ty::impl_trait_ref(self.tcx, def_id).unwrap().def_id;
                  match traits::orphan_check(self.tcx, def_id) {
                      Ok(()) => { }
                      Err(traits::OrphanCheckErr::NoLocalInputType) => {

diff --cc src/libsyntax/feature_gate.rs
Simple merge