From 88821ed54d2eacc35ccbf6ab056b6677f23c3e1a Mon Sep 17 00:00:00 2001
From: David Haig <david@ninjasource.com>
Date: Mon, 25 Nov 2019 15:27:42 +0000
Subject: [PATCH] Fixed merge issue

---
 src/librustc/mir/mod.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
index b2832c78ef4..67dc1da8a40 100644
--- a/src/librustc/mir/mod.rs
+++ b/src/librustc/mir/mod.rs
@@ -3048,6 +3048,16 @@ fn super_visit_with<V: TypeVisitor<'tcx>>(&self, visitor: &mut V) -> bool {
     }
 }
 
+impl<'tcx> TypeFoldable<'tcx> for GeneratorKind {
+    fn super_fold_with<F: TypeFolder<'tcx>>(&self, _: &mut F) -> Self {
+        *self
+    }
+
+    fn super_visit_with<V: TypeVisitor<'tcx>>(&self, _: &mut V) -> bool {
+        false
+    }
+}
+
 impl<'tcx> TypeFoldable<'tcx> for Place<'tcx> {
     fn super_fold_with<F: TypeFolder<'tcx>>(&self, folder: &mut F) -> Self {
         Place {
-- 
2.44.0