Merge branch 'master' into eq-hash

diff --cc src/lib.rs
index ffb17527ad04f7235d75d85286229d7b8d6bc0b8,88bca91aa2de5ab2c0ff251e50976be06c9de031..75397262b225a1d0d30b1d0b75e8c6f8d83fbae9
--- 1/src/lib.rs
--- 2/src/lib.rs
+++ b/src/lib.rs
@@@ -24,10 -26,7 +26,9 @@@ use rustc::ty::layout::{TyLayout, Layou
  use rustc::ty::subst::Subst;
  use rustc::hir::def_id::DefId;
  use rustc::mir;
- use rustc::middle::const_val;
  
 +use rustc_data_structures::fx::FxHasher;
 +
  use syntax::ast::Mutability;
  use syntax::codemap::Span;
  

diff --cc src/locks.rs
Simple merge

diff --cc src/range_map.rs
Simple merge