[commit: ghc] ghc-8.0: HsPat: Restore compatibility with ghc-7.8 (b7a2d22)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/b7a2d22901c991d1754741b1518f0ed1afb98eb2/ghc

>---------------------------------------------------------------

commit b7a2d22901c991d1754741b1518f0ed1afb98eb2
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Feb 29 20:36:50 2016 +0100

    HsPat: Restore compatibility with ghc-7.8


>---------------------------------------------------------------

b7a2d22901c991d1754741b1518f0ed1afb98eb2
 compiler/hsSyn/HsPat.hs          | 2 ++
 compiler/typecheck/TcGenDeriv.hs | 2 ++
 compiler/typecheck/TcPatSyn.hs   | 1 +
 3 files changed, 5 insertions(+)

diff --git a/compiler/hsSyn/HsPat.hs b/compiler/hsSyn/HsPat.hs
index 36c4faf..82aeb69 100644
--- a/compiler/hsSyn/HsPat.hs
+++ b/compiler/hsSyn/HsPat.hs
@@ -63,6 +63,8 @@ import DynFlags( gopt, GeneralFlag(..) )
 import Maybes
 -- libraries:
 import Data.Data hiding (TyCon,Fixity)
+import Data.Traversable (Traversable)
+import Data.Foldable (Foldable)
 
 type InPat id  = LPat id        -- No 'Out' constructors
 type OutPat id = LPat id        -- No 'In' constructors
diff --git a/compiler/typecheck/TcGenDeriv.hs b/compiler/typecheck/TcGenDeriv.hs
index c572b31..f9c368e 100644
--- a/compiler/typecheck/TcGenDeriv.hs
+++ b/compiler/typecheck/TcGenDeriv.hs
@@ -74,6 +74,8 @@ import StaticFlags( opt_PprStyle_Debug )
 import ListSetOps ( assocMaybe )
 import Data.List  ( partition, intersperse )
 import Data.Maybe ( catMaybes, isJust )
+import Data.Traversable ( mapM )
+import Prelude hiding (mapM)
 
 type BagDerivStuff = Bag DerivStuff
 
diff --git a/compiler/typecheck/TcPatSyn.hs b/compiler/typecheck/TcPatSyn.hs
index 425e203..b1f1ac8 100644
--- a/compiler/typecheck/TcPatSyn.hs
+++ b/compiler/typecheck/TcPatSyn.hs
@@ -51,6 +51,7 @@ import Data.Maybe
 import Control.Monad ( unless, zipWithM )
 import Data.List( partition )
 import Pair( Pair(..) )
+import Data.Traversable( traverse )
 
 #include "HsVersions.h"