From 9077e96aeb6760f0157b0cc4a91a619f08b04d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <dxld@darkboxed.org>
Date: Sun, 12 Apr 2015 03:03:37 +0200
Subject: [PATCH] Fix tests

---
 Language/Haskell/GhcMod/Caching.hs         | 2 --
 Language/Haskell/GhcMod/HomeModuleGraph.hs | 3 +--
 Language/Haskell/GhcMod/Target.hs          | 1 +
 Language/Haskell/GhcMod/Types.hs           | 1 -
 test/HomeModuleGraphSpec.hs                | 4 +---
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Language/Haskell/GhcMod/Caching.hs b/Language/Haskell/GhcMod/Caching.hs
index 54892c9..71067f9 100644
--- a/Language/Haskell/GhcMod/Caching.hs
+++ b/Language/Haskell/GhcMod/Caching.hs
@@ -10,8 +10,6 @@ import Utils (TimedFile(..), timeMaybe, mightExist)
 import Language.Haskell.GhcMod.Monad.Types
 import Language.Haskell.GhcMod.Logging
 
-import Utils
-
 data Cached m d a =
      Cached { cacheFile       :: FilePath,
               cachedAction    :: TimedCacheFiles -> d -> Maybe a -> m ([FilePath], a)
diff --git a/Language/Haskell/GhcMod/HomeModuleGraph.hs b/Language/Haskell/GhcMod/HomeModuleGraph.hs
index f42c6db..12badf2 100644
--- a/Language/Haskell/GhcMod/HomeModuleGraph.hs
+++ b/Language/Haskell/GhcMod/HomeModuleGraph.hs
@@ -48,7 +48,6 @@ import Control.Monad.State.Strict (execStateT)
 import Control.Monad.State.Class
 import Data.Maybe
 import Data.Monoid
-import Data.Traversable as T (mapM)
 import Data.Map  (Map)
 import qualified Data.Map  as Map
 import Data.Set (Set)
@@ -58,7 +57,6 @@ import System.Directory
 
 import Language.Haskell.GhcMod.Logging
 import Language.Haskell.GhcMod.Logger
-import Language.Haskell.GhcMod.PathsAndFiles
 import Language.Haskell.GhcMod.Monad.Types
 import Language.Haskell.GhcMod.Types
 import Language.Haskell.GhcMod.Gap (parseModuleHeader)
@@ -150,6 +148,7 @@ find env mn = liftIO $ do
     _ -> return Nothing
 
 
+canonicalizeModulePath :: ModulePath -> IO ModulePath
 canonicalizeModulePath (ModulePath mn fp) = ModulePath mn <$> canonicalizePath fp
 
 canonicalizeModuleGraph :: MonadIO m => GmModuleGraph -> m GmModuleGraph
diff --git a/Language/Haskell/GhcMod/Target.hs b/Language/Haskell/GhcMod/Target.hs
index 07199a6..ef668f7 100644
--- a/Language/Haskell/GhcMod/Target.hs
+++ b/Language/Haskell/GhcMod/Target.hs
@@ -43,6 +43,7 @@ import Data.Maybe
 import Data.Monoid
 import Data.Either
 import Data.Foldable (foldrM)
+import Data.Traversable (traverse)
 import Data.IORef
 import Data.Map (Map)
 import qualified Data.Map  as Map
diff --git a/Language/Haskell/GhcMod/Types.hs b/Language/Haskell/GhcMod/Types.hs
index f7340d0..dbbee80 100644
--- a/Language/Haskell/GhcMod/Types.hs
+++ b/Language/Haskell/GhcMod/Types.hs
@@ -13,7 +13,6 @@ import Control.Monad.Error (Error(..))
 import qualified Control.Monad.IO.Class as MTL
 import Control.Exception (Exception)
 import Control.Applicative
-import Control.Arrow
 import Data.Serialize
 import Data.Version
 import Data.List (intercalate)
diff --git a/test/HomeModuleGraphSpec.hs b/test/HomeModuleGraphSpec.hs
index b4640d1..7e43140 100644
--- a/test/HomeModuleGraphSpec.hs
+++ b/test/HomeModuleGraphSpec.hs
@@ -72,7 +72,7 @@ spec = do
                 , mp "H"
                 , mp "I"
                 ]
-            fileMap = mkFileMap smp
+
             moduleMap = mkModuleMap smp
 
             completeGraph =
@@ -104,8 +104,6 @@ spec = do
                 ]
 
             g = GmModuleGraph {
-               gmgFileMap   = fileMap,
-               gmgModuleMap = moduleMap,
                gmgGraph     = graph
              }