summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Feuer <David.Feuer@gmail.com>2014-11-08 21:43:27 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2014-11-08 21:43:34 +0100
commite2769df912672d39346727616750ba8066e489f9 (patch)
tree0d7b87c444bbb1006049c6fda4c35ffe11e4f1c2
parent8e66365b0046f78d4f3b24f2ba39171c633568fa (diff)
downloadhaskell-e2769df912672d39346727616750ba8066e489f9.tar.gz
Use (.) and id from Base in Control.Applicative
Control.Applicative previously imported `(.)` and `id` from `Control.Arrow`, but then only applied them to functions. Reviewed By: ekmett, hvr Differential Revision: https://phabricator.haskell.org/D462
-rw-r--r--libraries/base/Control/Applicative.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/base/Control/Applicative.hs b/libraries/base/Control/Applicative.hs
index cc87343fc2..924ad5ef1e 100644
--- a/libraries/base/Control/Applicative.hs
+++ b/libraries/base/Control/Applicative.hs
@@ -49,7 +49,7 @@ module Control.Applicative (
optional,
) where
-import Control.Category
+import Control.Category hiding ((.), id)
import Control.Arrow
import Data.Maybe
import Data.Tuple
@@ -58,7 +58,7 @@ import Data.Ord
import Data.Foldable (Foldable(..))
import Data.Functor ((<$>))
-import GHC.Base hiding ((.), id)
+import GHC.Base
import GHC.Generics
import GHC.List (repeat, zipWith)
import GHC.Read (Read)