From 614522644b69b6e5248b3425c856b78ea5117972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Mon, 3 Aug 2015 07:51:23 +0200 Subject: [PATCH] Fix imports for ghc < 7.10 --- Language/Haskell/GhcMod/Gap.hs | 2 +- Language/Haskell/GhcMod/PathsAndFiles.hs | 2 +- Language/Haskell/GhcMod/Target.hs | 2 +- Language/Haskell/GhcMod/World.hs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Language/Haskell/GhcMod/Gap.hs b/Language/Haskell/GhcMod/Gap.hs index 9ca8cd9..c8b6e0f 100644 --- a/Language/Haskell/GhcMod/Gap.hs +++ b/Language/Haskell/GhcMod/Gap.hs @@ -49,7 +49,7 @@ import CoreSyn (CoreExpr) import Data.List (intersperse) import Data.Maybe (catMaybes) import Data.Time.Clock (UTCTime) -import Data.Traversable +import Data.Traversable hiding (mapM) import DataCon (dataConRepType) import Desugar (deSugarExpr) import DynFlags diff --git a/Language/Haskell/GhcMod/PathsAndFiles.hs b/Language/Haskell/GhcMod/PathsAndFiles.hs index ebb5c4b..90b88ff 100644 --- a/Language/Haskell/GhcMod/PathsAndFiles.hs +++ b/Language/Haskell/GhcMod/PathsAndFiles.hs @@ -25,7 +25,7 @@ import Control.Monad import Data.List import Data.Char import Data.Maybe -import Data.Traversable +import Data.Traversable hiding (mapM) import Distribution.Helper (buildPlatform) import System.Directory import System.FilePath diff --git a/Language/Haskell/GhcMod/Target.hs b/Language/Haskell/GhcMod/Target.hs index 7536b58..74b1f6c 100644 --- a/Language/Haskell/GhcMod/Target.hs +++ b/Language/Haskell/GhcMod/Target.hs @@ -44,7 +44,7 @@ import Data.Maybe import Data.Monoid as Monoid import Data.Either import Data.Foldable (foldrM) -import Data.Traversable +import Data.Traversable hiding (mapM, forM) import Data.IORef import Data.Map (Map) import qualified Data.Map as Map diff --git a/Language/Haskell/GhcMod/World.hs b/Language/Haskell/GhcMod/World.hs index 9f77a0c..c9d6b49 100644 --- a/Language/Haskell/GhcMod/World.hs +++ b/Language/Haskell/GhcMod/World.hs @@ -7,7 +7,7 @@ import Language.Haskell.GhcMod.Utils import Control.Applicative import Data.Maybe -import Data.Traversable +import Data.Traversable hiding (mapM) import System.FilePath (()) import GHC.Paths (libdir)