From fb0972dadf7b0c83519c88d5b5353d502feeef12 Mon Sep 17 00:00:00 2001
From: David Haig <david@ninjasource.com>
Date: Mon, 25 Nov 2019 13:38:08 +0000
Subject: Fixed merge issue

---
 src/librustc/mir/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
index d6048a1b394..b2832c78ef4 100644
--- a/src/librustc/mir/mod.rs
+++ b/src/librustc/mir/mod.rs
@@ -6,7 +6,7 @@
 
 use crate::hir::def::{CtorKind, Namespace};
 use crate::hir::def_id::DefId;
-use crate::hir::GeneratorKind;
+use crate::hir::{self, GeneratorKind};
 use crate::mir::interpret::{GlobalAlloc, PanicInfo, Scalar};
 use crate::mir::visit::MirVisitable;
 use crate::ty::adjustment::PointerCast;
-- 
cgit 1.4.1-3-g733a5