[commit: ghc] wip/nfs-locking: Base: Reexport `MonadTrans` instead of `Reader` (6472042)

[git at git.haskell.org]

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

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

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

commit 6472042ba8fddbc721b1bc6ae322a58212b5fe32
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 24 14:35:31 2015 +0100

    Base: Reexport `MonadTrans` instead of `Reader`
    
    The former is much more common than the latter.


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

6472042ba8fddbc721b1bc6ae322a58212b5fe32
 src/Base.hs                   | 2 +-
 src/Builder.hs                | 2 ++
 src/Expression.hs             | 2 ++
 src/Oracles/Config/Flag.hs    | 2 ++
 src/Oracles/Config/Setting.hs | 2 ++
 src/Target.hs                 | 2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Base.hs b/src/Base.hs
index aa9861b..fb0eed7 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -2,11 +2,11 @@ module Base (
     -- * General utilities
     module Control.Applicative,
     module Control.Monad.Extra,
-    module Control.Monad.Reader,
     module Data.Function,
     module Data.List,
     module Data.Maybe,
     module Data.Monoid,
+    MonadTrans(lift),
 
     -- * Shake
     module Development.Shake,
diff --git a/src/Builder.hs b/src/Builder.hs
index b6fd228..78f8376 100644
--- a/src/Builder.hs
+++ b/src/Builder.hs
@@ -3,6 +3,8 @@ module Builder (
     Builder (..), builderPath, getBuilderPath, specified, needBuilder
     ) where
 
+import Control.Monad.Trans.Reader
+
 import Base
 import GHC.Generics (Generic)
 import Oracles
diff --git a/src/Expression.hs b/src/Expression.hs
index 0d47314..a83ea15 100644
--- a/src/Expression.hs
+++ b/src/Expression.hs
@@ -24,6 +24,8 @@ module Expression (
     module Way
     ) where
 
+import Control.Monad.Trans.Reader
+
 import Base
 import Package
 import Builder
diff --git a/src/Oracles/Config/Flag.hs b/src/Oracles/Config/Flag.hs
index 47ea75d..d40b762 100644
--- a/src/Oracles/Config/Flag.hs
+++ b/src/Oracles/Config/Flag.hs
@@ -4,6 +4,8 @@ module Oracles.Config.Flag (
     ghcWithNativeCodeGen, supportsSplitObjects
     ) where
 
+import Control.Monad.Trans.Reader
+
 import Base
 import Oracles.Config
 import Oracles.Config.Setting
diff --git a/src/Oracles/Config/Setting.hs b/src/Oracles/Config/Setting.hs
index 81e2924..b0c6da3 100644
--- a/src/Oracles/Config/Setting.hs
+++ b/src/Oracles/Config/Setting.hs
@@ -6,6 +6,8 @@ module Oracles.Config.Setting (
     ghcCanonVersion, cmdLineLengthLimit
     ) where
 
+import Control.Monad.Trans.Reader
+
 import Base
 import Oracles.Config
 import Stage
diff --git a/src/Target.hs b/src/Target.hs
index 2060d04..25967b4 100644
--- a/src/Target.hs
+++ b/src/Target.hs
@@ -3,6 +3,8 @@ module Target (
     Target (..), PartialTarget (..), fromPartial, fullTarget, fullTargetWithWay
     ) where
 
+import Control.Monad.Trans.Reader
+
 import Base
 import Builder
 import GHC.Generics (Generic)