[commit: ghc] master: Use (.) and id from Base in Control.Applicative (e2769df)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e2769df912672d39346727616750ba8066e489f9/ghc

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

commit e2769df912672d39346727616750ba8066e489f9
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Nov 8 21:43:27 2014 +0100

    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


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

e2769df912672d39346727616750ba8066e489f9
 libraries/base/Control/Applicative.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/base/Control/Applicative.hs b/libraries/base/Control/Applicative.hs
index cc87343..924ad5e 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)