From 1e8e7c0980700173d4d9d71c6747affb7cafe255 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 23 May 2013 11:54:24 +0300
Subject: [PATCH] Fix some warnings

---
 Stackage/InstallInfo.hs    |  1 -
 Stackage/NarrowDatabase.hs |  1 -
 Stackage/Uploads.hs        | 14 ++++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Stackage/InstallInfo.hs b/Stackage/InstallInfo.hs
index 11776fb4..77419e7d 100644
--- a/Stackage/InstallInfo.hs
+++ b/Stackage/InstallInfo.hs
@@ -9,7 +9,6 @@ import qualified Data.Map                 as Map
 import qualified Data.Set                 as Set
 import           Data.Version             (showVersion)
 import qualified Distribution.Text
-import           Distribution.Text        (display)
 import           Distribution.Version     (simplifyVersionRange, withinRange)
 import           Stackage.HaskellPlatform
 import           Stackage.LoadDatabase
diff --git a/Stackage/NarrowDatabase.hs b/Stackage/NarrowDatabase.hs
index 9ef99188..6c3fccd3 100644
--- a/Stackage/NarrowDatabase.hs
+++ b/Stackage/NarrowDatabase.hs
@@ -7,7 +7,6 @@ import           Prelude                    hiding (pi)
 import           Stackage.Types
 import           Stackage.Util
 import           System.Exit                (exitFailure)
-import Distribution.Text (display)
 
 -- | Narrow down the database to only the specified packages and all of
 -- their dependencies.
diff --git a/Stackage/Uploads.hs b/Stackage/Uploads.hs
index 2ce9846d..ea8406da 100644
--- a/Stackage/Uploads.hs
+++ b/Stackage/Uploads.hs
@@ -34,7 +34,6 @@ checkUploads allowedFP newAllowedFP = do
     _ <- evaluate $ msize forbidden
 
     unless (Map.null $ unMonoidMap allowed') $ do
-        let fp = "new-allowed.txt"
         putStrLn $ "Newly uploaded packages detected, writing to " ++ newAllowedFP
         writeAllowed newAllowedFP allowed'
 
@@ -47,9 +46,16 @@ instance (Ord k, Monoid v) => Monoid (MonoidMap k v) where
     MonoidMap x `mappend` MonoidMap y = MonoidMap $ Map.unionWith mappend x y
 
 -- And some helper functions.
+mlookup :: Ord k => k -> MonoidMap k v -> Maybe v
 mlookup k = Map.lookup k . unMonoidMap
+
+msingleton :: k -> v -> MonoidMap k v
 msingleton k = MonoidMap . Map.singleton k
+
+mkeys :: MonoidMap k v -> [k]
 mkeys = Map.keys . unMonoidMap
+
+msize :: MonoidMap k v -> Int
 msize = Map.size . unMonoidMap
 
 type Version = String
@@ -106,7 +112,7 @@ updateAllowed uploads allowed =
     go pkg =
         case (mlookup pkg uploads, mlookup pkg allowed) of
             (Nothing, Nothing) -> assert False (mempty, mempty)
-            (Nothing, Just a) -> (mempty, mempty)
+            (Nothing, Just _) -> (mempty, mempty)
             (Just u, Nothing) -> (msingleton pkg $ getAllUsers u, mempty)
             (Just u, Just a) ->
                 let fval = mconcat $ map (check a) $ Map.toList u
@@ -119,8 +125,8 @@ updateAllowed uploads allowed =
     getAllUsers = Set.fromList . map fst . Map.elems
 
     check :: Set UserName -> (Version, (UserName, UTCTime)) -> Map Version (UserName, UTCTime)
-    check allowed (ver, (user, time))
-        | user `Set.member` allowed = Map.empty
+    check allowed' (ver, (user, time))
+        | user `Set.member` allowed' = Map.empty
         | otherwise = Map.singleton ver (user, time)
 
 writeAllowed :: FilePath -> Allowed -> IO ()