[commit: packages/containers] changelog-foldtree, cleaned_bugfix394, develop, develop-0.6, develop-0.6-questionable, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-184-generic, revert-408-bugfix_394, zip-devel: tree: Fix imports for the Applicative/Monad change (c40e6dd)

[git at git.haskell.org]

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

On branches: changelog-foldtree,cleaned_bugfix394,develop,develop-0.6,develop-0.6-questionable,master,merge-doc-target,merge-fixes-5.9,merge-restrict-fix-5.8,revert-184-generic,revert-408-bugfix_394,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c40e6dd40861d788ee0cc337775d803d8907b6ff

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

commit c40e6dd40861d788ee0cc337775d803d8907b6ff
Author: Austin Seipp <aseipp at pobox.com>
Date:   Mon May 12 07:31:59 2014 -0500

    tree: Fix imports for the Applicative/Monad change
    
    Due to various problems with orphans and cycles in base, while
    implementing the Applicative/Monad Proposal, Alternative joined
    MonadPlus in Control.Monad.
    
    A knock-on effect of this is that Control.Monad now exports 'empty',
    which conflicts with Data.Sequence in this case. Luckily the fix is
    actually quite easy: just restrict the imports to liftM, since that's
    all we use anyway.
    
    Signed-off-by: Austin Seipp <aseipp at pobox.com>


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

c40e6dd40861d788ee0cc337775d803d8907b6ff
 Data/Tree.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Tree.hs b/Data/Tree.hs
index 56af20f..dab25c2 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -32,7 +32,7 @@ module Data.Tree(
     ) where
 
 import Control.Applicative (Applicative(..), (<$>))
-import Control.Monad
+import Control.Monad (liftM)
 import Data.Monoid (Monoid(..))
 import Data.Sequence (Seq, empty, singleton, (<|), (|>), fromList,
             ViewL(..), ViewR(..), viewl, viewr)