From 72cd90548465f9f2c378d287be161e8fe258f8eb Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 2 Oct 2018 09:25:55 +0200
Subject: [PATCH] rustup

---
 src/intrinsic.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/intrinsic.rs b/src/intrinsic.rs
index 53462488b6f7..e9a5714587fb 100644
--- a/src/intrinsic.rs
+++ b/src/intrinsic.rs
@@ -2,12 +2,13 @@ use rustc::mir;
 use rustc::ty::layout::{self, LayoutOf, Size};
 use rustc::ty;
 
-use rustc::mir::interpret::{EvalResult, Scalar, ScalarMaybeUndef, PointerArithmetic};
-use rustc_mir::interpret::{
-    PlaceTy, EvalContext, OpTy, Value
-};
+use rustc::mir::interpret::{EvalResult, PointerArithmetic};
+use rustc_mir::interpret::{EvalContext, PlaceTy, OpTy};
 
-use super::{FalibleScalarExt, OperatorEvalContextExt};
+use super::{
+    Value, Scalar, ScalarMaybeUndef,
+    FalibleScalarExt, OperatorEvalContextExt
+};
 
 pub trait EvalContextExt<'tcx> {
     fn call_intrinsic(