auto merge of #11485 : eddyb/rust/sweep-old-rust, r=nikomatsakis

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

diff --cc src/librustc/middle/trans/debuginfo.rs
Simple merge

diff --cc src/librustc/middle/trans/tvec.rs
Simple merge

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

diff --cc src/librustc/middle/typeck/check/_match.rs
index 0d7a1258972c4024f4ec7146433964817b9f6974,ad6c345198ba2070c7d5ff8c87f2a2d0b197a83e..9303bf80208a7843b8941c276c6dda5f920a94c3
--- 1/src/librustc/middle/typeck/check/_match.rs
--- 2/src/librustc/middle/typeck/check/_match.rs
+++ b/src/librustc/middle/typeck/check/_match.rs
@@@ -669,8 -672,11 +669,8 @@@ pub fn check_pointer_pat(pcx: &pat_ctxt
          fcx.write_ty(pat_id, expected);
      };
      match *structure_of(fcx, span, expected) {
 -        ty::ty_box(e_inner) if pointer_kind == Managed => {
 -            check_inner(e_inner);
 -        }
          ty::ty_uniq(e_inner) if pointer_kind == Send => {
-             check_inner(e_inner.ty);
+             check_inner(e_inner);
          }
          ty::ty_rptr(_, e_inner) if pointer_kind == Borrowed => {
              check_inner(e_inner.ty);

diff --cc src/librustc/middle/typeck/check/method.rs
Simple merge

diff --cc src/librustc/middle/typeck/check/mod.rs
Simple merge

diff --cc src/librustc/middle/typeck/check/vtable.rs
Simple merge

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

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

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

diff --cc src/libsyntax/parse/parser.rs
Simple merge

diff --cc src/libsyntax/print/pprust.rs
Simple merge

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