From 2a55d2fc4550753bebc65defd5d9c735268e7321 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <github35764891676564198441@oli-obk.de>
Date: Thu, 28 Jun 2018 11:19:45 +0200
Subject: [PATCH] Rebase fallout

---
 src/librustc/traits/query/normalize.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustc/traits/query/normalize.rs b/src/librustc/traits/query/normalize.rs
index bc2f1b7f6c7c..a67383fb79aa 100644
--- a/src/librustc/traits/query/normalize.rs
+++ b/src/librustc/traits/query/normalize.rs
@@ -14,7 +14,7 @@
 
 use infer::{InferCtxt, InferOk};
 use infer::at::At;
-use mir::interpret::{GlobalId, ConstVal};
+use mir::interpret::{GlobalId, ConstValue};
 use traits::{Obligation, ObligationCause, PredicateObligation, Reveal};
 use traits::project::Normalized;
 use ty::{self, Ty, TyCtxt};