From: Ralf Jung <post@ralfj.de>
Date: Fri, 13 Jul 2018 06:29:42 +0000 (+0200)
Subject: Merge branch 'master' into eq-hash
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a2f4d84f73647ac755871a06570fee636897b8c7;p=rust.git

Merge branch 'master' into eq-hash
---

a2f4d84f73647ac755871a06570fee636897b8c7
diff --cc src/lib.rs
index ffb17527ad0,88bca91aa2d..75397262b22
--- a/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;