X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Data%2FTraversable.hs;h=675409461bd51b7d95fa0bcffd575e45d19eb228;hb=b9b6e38a1ebb5f05b382609fe0776d91cdd1090b;hp=1c7d83bd098dc65de5adacc7140286971020b877;hpb=30464c0cb915c2ae900909568fa8677bba341e45;p=haskell-directory.git

diff --git a/Data/Traversable.hs b/Data/Traversable.hs
index 1c7d83b..6754094 100644
--- a/Data/Traversable.hs
+++ b/Data/Traversable.hs
@@ -27,10 +27,10 @@ module Data.Traversable (
 	foldMapDefault,
 	) where
 
-import Prelude hiding (mapM, sequence)
-import qualified Prelude (mapM)
+import Prelude hiding (mapM, sequence, foldr)
+import qualified Prelude (mapM, foldr)
 import Control.Applicative
-import Data.Foldable (Foldable)
+import Data.Foldable (Foldable())
 import Data.Monoid (Monoid)
 import Data.Array
 
@@ -90,7 +90,7 @@ instance Traversable Maybe where
 	traverse f (Just x) = Just <$> f x
 
 instance Traversable [] where
-	traverse f = foldr cons_f (pure [])
+	traverse f = Prelude.foldr cons_f (pure [])
 	  where cons_f x ys = (:) <$> f x <*> ys
 
 	mapM = Prelude.mapM