Prepare for splitting off ghc-mod-core eventually

test/BrowseSpec.hs

@@ -1,7 +1,7 @@
 module BrowseSpec where
 
 import Control.Applicative
-import Language.Haskell.GhcMod
+import GhcMod
 import Test.Hspec
 import Prelude
 

test/CaseSplitSpec.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
 module CaseSplitSpec where
 
-import Language.Haskell.GhcMod
+import GhcMod
 import Test.Hspec
 import TestUtils
 import Dir

test/CheckSpec.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP #-}
 module CheckSpec where
 
-import Language.Haskell.GhcMod
+import GhcMod
 
 import Data.List
 import System.Process

test/FileMappingSpec.hs

@@ -9,7 +9,7 @@ import Dir
 import System.IO.Temp
 import System.Directory
 
-import Language.Haskell.GhcMod
+import GhcMod
 
 spec :: Spec
 spec = do

test/FindSpec.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 module FindSpec where
 
-import Language.Haskell.GhcMod.Find
+import GhcMod.Find
 import Test.Hspec
 import TestUtils
 

test/FlagSpec.hs

@@ -1,7 +1,7 @@
 module FlagSpec where
 
 import Control.Applicative
-import Language.Haskell.GhcMod
+import GhcMod
 import Test.Hspec
 import TestUtils
 import Prelude

test/InfoSpec.hs

@@ -3,7 +3,7 @@ module InfoSpec where
 
 import Control.Applicative
 import Data.List (isPrefixOf)
-import Language.Haskell.GhcMod
+import GhcMod
 #if __GLASGOW_HASKELL__ < 706
 import System.Environment.Executable (getExecutablePath)
 #else

test/LangSpec.hs

@@ -1,7 +1,7 @@
 module LangSpec where
 
 import Control.Applicative
-import Language.Haskell.GhcMod
+import GhcMod
 import Test.Hspec
 import TestUtils
 import Prelude

test/LintSpec.hs

@@ -1,6 +1,6 @@
 module LintSpec where
 
-import Language.Haskell.GhcMod
+import GhcMod
 import Test.Hspec
 import TestUtils
 

test/ListSpec.hs

@@ -1,7 +1,7 @@
 module ListSpec where
 
 import Control.Applicative
-import Language.Haskell.GhcMod
+import GhcMod
 import Test.Hspec
 import TestUtils
 import Prelude

test/Main.hs

@@ -4,7 +4,7 @@ import Dir
 
 import Control.Exception as E
 import Control.Monad (void)
-import Language.Haskell.GhcMod (debugInfo)
+import GhcMod (debugInfo)
 import System.Process
 import System.Environment
 import Test.Hspec

test/doctests.hs

@@ -15,7 +15,8 @@ main = do
      , "-package", "directory-" ++ VERSION_directory
      , "-XScopedTypeVariables", "-XRecordWildCards", "-XNamedFieldPuns", "-XConstraintKinds", "-XFlexibleContexts", "-XDataKinds", "-XKindSignatures", "-XTypeOperators", "-XViewPatterns"
      , "-i" ++ distdir ++ "/build/autogen/"
-     , "-optP-include"
-     , "-optP" ++ distdir ++ "/build/autogen/cabal_macros.h"
-     , "Language/Haskell/GhcMod.hs"
+     , "-icore/"
+--     , "-optP-include"
+--     , "-optP" ++ distdir ++ "/build/autogen/cabal_macros.h"
+     , "GhcMod.hs"
      ]