[commit: ghc] wip/nfs-locking: Base: Don't reexport Development.Shake.Config (1405953)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:18:55 UTC 2017


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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/14059539b1fa2b5e79e38c34266636c60dfb40f4/ghc

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

commit 14059539b1fa2b5e79e38c34266636c60dfb40f4
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 24 14:37:49 2015 +0100

    Base: Don't reexport Development.Shake.Config


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

14059539b1fa2b5e79e38c34266636c60dfb40f4
 src/Base.hs                | 2 --
 src/Oracles/Config.hs      | 1 +
 src/Oracles/PackageData.hs | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Base.hs b/src/Base.hs
index fb0eed7..1012d4e 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -11,7 +11,6 @@ module Base (
     -- * Shake
     module Development.Shake,
     module Development.Shake.Classes,
-    module Development.Shake.Config,
     module Development.Shake.FilePath,
     module Development.Shake.Util,
 
@@ -38,7 +37,6 @@ import Data.Maybe
 import Data.Monoid
 import Development.Shake hiding (unit, (*>), parallel)
 import Development.Shake.Classes
-import Development.Shake.Config
 import Development.Shake.FilePath
 import Development.Shake.Util
 import System.Console.ANSI
diff --git a/src/Oracles/Config.hs b/src/Oracles/Config.hs
index e8333b6..cde2383 100644
--- a/src/Oracles/Config.hs
+++ b/src/Oracles/Config.hs
@@ -3,6 +3,7 @@ module Oracles.Config (askConfig, askConfigWithDefault, configOracle) where
 
 import Base
 import qualified Data.HashMap.Strict as Map
+import Development.Shake.Config
 
 newtype ConfigKey = ConfigKey String
     deriving (Show, Typeable, Eq, Hashable, Binary, NFData)
diff --git a/src/Oracles/PackageData.hs b/src/Oracles/PackageData.hs
index 4e3d306..d176839 100644
--- a/src/Oracles/PackageData.hs
+++ b/src/Oracles/PackageData.hs
@@ -4,6 +4,7 @@ module Oracles.PackageData (
     pkgData, pkgDataList, packageDataOracle
     ) where
 
+import Development.Shake.Config
 import Base
 import qualified Data.HashMap.Strict as Map
 



More information about the ghc-commits mailing list