Merge remote branch 'nmatsakis/issue-4808-representation-of-extern-fn' into incoming

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

diff --cc src/librustc/middle/borrowck/gather_loans.rs
Simple merge

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

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

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

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

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

diff --cc src/librustc/middle/trans/expr.rs
index c6ed190c7c371d9e25530a1d8d4e52a837bc14a7,8ceb539351e17074042a67011e2cc6cd96a3a797..7fe2bd605e9ff182c1d3a1b4c61af6310259eeaa
--- 1/src/librustc/middle/trans/expr.rs
--- 2/src/librustc/middle/trans/expr.rs
+++ b/src/librustc/middle/trans/expr.rs
@@@ -141,10 -135,9 +141,11 @@@ use middle::trans::debuginfo
  use middle::trans::machine;
  use middle::trans::meth;
  use middle::trans::tvec;
 +use middle::trans::type_of;
 +use middle::ty;
  use middle::ty::struct_mutable_fields;
- use middle::ty::{AutoPtr, AutoBorrowVec, AutoBorrowVecRef, AutoBorrowFn};
+ use middle::ty::{AutoPtr, AutoBorrowVec, AutoBorrowVecRef, AutoBorrowFn,
+                  AutoDerefRef, AutoAddEnv};
  use util::common::indenter;
  use util::ppaux::ty_to_str;
  

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

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

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

diff --cc src/librustc/middle/typeck/infer/coercion.rs
Simple merge