rollup merge of #20416: nikomatsakis/coherence

Conflicts:
	src/test/run-pass/issue-15734.rs
	src/test/run-pass/issue-3743.rs

diff --cc src/libcollections/lib.rs
Simple merge

diff --cc src/libgraphviz/maybe_owned_vec.rs
Simple merge

diff --cc src/librustc/metadata/decoder.rs
Simple merge

diff --cc src/librustc/middle/ty.rs
Simple merge

diff --cc src/librustc_typeck/coherence/orphan.rs
Simple merge

diff --cc src/librustdoc/lib.rs
Simple merge

diff --cc src/libserialize/json.rs
Simple merge

diff --cc src/libstd/lib.rs
Simple merge

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

diff --cc src/libtest/lib.rs
Simple merge

diff --cc src/libtime/lib.rs
Simple merge

diff --cc src/test/run-pass/issue-11881.rs
Simple merge

diff --cc src/test/run-pass/issue-15734.rs
index 8aa7447ccd2e90f787ee74f6b7cae63938f1df48,72123b8e5a5ef7dc9afcb059926356870dfef86b..e99b1dc5befb00fdf1d2e11d80cc847b0516fe7c
--- 1/src/test/run-pass/issue-15734.rs
--- 2/src/test/run-pass/issue-15734.rs
+++ b/src/test/run-pass/issue-15734.rs
@@@ -8,8 -8,10 +8,12 @@@
  // option. This file may not be copied, modified, or distributed
  // except according to those terms.
  
+ // If `Index` used an associated type for its output, this test would
+ // work more smoothly.
+ #![feature(old_orphan_check)]
+ 
 +use std::ops::Index;
 +
  struct Mat<T> { data: Vec<T>, cols: uint, }
  
  impl<T> Mat<T> {

diff --cc src/test/run-pass/issue-3743.rs
index c88022f3eb706ce28541d2958bb0c0cac9393298,ac200c81143b11e42e3fc47896ebabd388b4778c..cb4f1b7d20f14213b11434073d5c471755ad8589
--- 1/src/test/run-pass/issue-3743.rs
--- 2/src/test/run-pass/issue-3743.rs
+++ b/src/test/run-pass/issue-3743.rs
@@@ -8,8 -8,10 +8,12 @@@
  // option. This file may not be copied, modified, or distributed
  // except according to those terms.
  
+ // If `Mul` used an associated type for its output, this test would
+ // work more smoothly.
+ #![feature(old_orphan_check)]
+ 
 +use std::ops::Mul;
 +
  struct Vec2 {
      x: f64,
      y: f64

diff --cc src/test/run-pass/overloaded-calls-param-vtables.rs
index 95df1ed0d837ed176e9536824f860a5a26eec7fe,96420f17deb7d2c16f1b191d808193ad0e12d721..bdaccee65d7f53bfeb208f99b02ae65f576ebd78
--- 1/src/test/run-pass/overloaded-calls-param-vtables.rs
--- 2/src/test/run-pass/overloaded-calls-param-vtables.rs
+++ b/src/test/run-pass/overloaded-calls-param-vtables.rs
@@@ -13,11 -13,10 +13,11 @@@
  #![feature(unboxed_closures)]
  
  use std::ops::Fn;
 +use std::ops::Add;
  
- struct G;
+ struct G<A>;
  
- impl<'a, A: Add<int, int>> Fn<(A,), int> for G {
+ impl<'a, A: Add<int, int>> Fn<(A,), int> for G<A> {
      extern "rust-call" fn call(&self, (arg,): (A,)) -> int {
          arg.add(1)
      }