auto merge of #8619 : pnkfelix/rust/fsk-visitor-vpar-defaults-step3, r=nmatsakis

Follow up to #8539 (step 2 of 5).

(See  #8527, which was step 1 of 5, for the full outline.)

Part of #7081.

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

diff --cc src/librustc/middle/trans/callee.rs
index c4720f5cb35b144e156782518af4286301566783,15dbcf554883944324a7e5b6755afa1ec837efd3..ab5f3289cc7226619160e52f8dd18df918570dd5
--- 1/src/librustc/middle/trans/callee.rs
--- 2/src/librustc/middle/trans/callee.rs
+++ b/src/librustc/middle/trans/callee.rs
@@@ -47,9 -46,9 +47,10 @@@ use util::ppaux::Repr
  use middle::trans::type_::Type;
  
  use syntax::ast;
 +use syntax::abi::AbiSet;
  use syntax::ast_map;
- use syntax::oldvisit;
+ use syntax::visit;
+ use syntax::visit::Visitor;
  
  // Represents a (possibly monomorphized) top-level fn item or method
  // item.  Note that this is just the fn-ptr and is not a Rust closure

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