Merge remote-tracking branch 'upstream/no-set'

Conflicts: Language/Haskell/GhcMod/Find.hs
2014-10-03 21:21:26 +02:00
parent 5a4bec8755 c4929c54af
commit ab7059d5e4
12 changed files with 441 additions and 238 deletions
--- a/Language/Haskell/GhcMod/Internal.hs
+++ b/Language/Haskell/GhcMod/Internal.hs
@@ -49,11 +49,16 @@ module Language.Haskell.GhcMod.Internal (
  , (||>)
  , goNext
  , runAnyOne
+  -- * World
+  , World
+  , getCurrentWorld
+  , isWorldChanged
  ) where

 import GHC.Paths (libdir)

 import Language.Haskell.GhcMod.CabalApi
+import Language.Haskell.GhcMod.CabalConfig
 import Language.Haskell.GhcMod.DynFlags
 import Language.Haskell.GhcMod.Error
 import Language.Haskell.GhcMod.GHCChoice