[commit: packages/Cabal] ghc-head: Tidy up (8558340)

[git at git.haskell.org]

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

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=8558340be1f53de13d983e4db6805dbd32cac60b

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

commit 8558340be1f53de13d983e4db6805dbd32cac60b
Author: Benno Fünfstück <benno.fuenfstueck at gmail.com>
Date:   Wed Jul 10 19:51:15 2013 +0200

    Tidy up
    
    Remove uneeded import of join and add a wildcard pattern when f is
    unused by fmap.


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

8558340be1f53de13d983e4db6805dbd32cac60b
 Cabal/Distribution/Compat/ReadP.hs |    1 -
 Cabal/Distribution/ParseUtils.hs   |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Cabal/Distribution/Compat/ReadP.hs b/Cabal/Distribution/Compat/ReadP.hs
index 62f875f..5c1113c 100644
--- a/Cabal/Distribution/Compat/ReadP.hs
+++ b/Cabal/Distribution/Compat/ReadP.hs
@@ -72,7 +72,6 @@ module Distribution.Compat.ReadP
 import Control.Monad( MonadPlus(..), liftM2 )
 import Data.Char (isSpace)
 import Control.Applicative (Applicative(..))
-import Control.Monad (join)
 
 infixr 5 +++, <++
 
diff --git a/Cabal/Distribution/ParseUtils.hs b/Cabal/Distribution/ParseUtils.hs
index 71fc8d6..16ed6d6 100644
--- a/Cabal/Distribution/ParseUtils.hs
+++ b/Cabal/Distribution/ParseUtils.hs
@@ -87,7 +87,7 @@ import Data.Char (isSpace, toLower, isAlphaNum, isDigit)
 import Data.Maybe       (fromMaybe)
 import Data.Tree as Tree (Tree(..), flatten)
 import qualified Data.Map as Map
-import Control.Monad (foldM, join) 
+import Control.Monad (foldM) 
 import Control.Applicative (Applicative(..))
 import System.FilePath (normalise)
 import Data.List (sortBy)
@@ -117,7 +117,7 @@ data ParseResult a = ParseFailed PError | ParseOk [PWarning] a
         deriving Show
 
 instance Functor ParseResult where
-        fmap f (ParseFailed err) = ParseFailed err
+        fmap _ (ParseFailed err) = ParseFailed err
         fmap f (ParseOk ws x) = ParseOk ws $ f x
         
 instance Applicative ParseResult where