Permalink
Browse files

Some more -Wall fixes

  • Loading branch information...
1 parent 9d28e5b commit 1cec758cd4cbef5cf2e95134db0a979e9c5875b1 @trofi trofi committed Mar 7, 2009
Showing with 8 additions and 16 deletions.
  1. +1 −5 Portage/Cabal.hs
  2. +4 −4 Portage/Overlay.hs
  3. +3 −7 Portage/PackageId.hs
View
@@ -1,19 +1,15 @@
module Portage.Cabal
(fromOverlay) where
-import Data.List as List
-import Data.Maybe
import qualified Data.Map as Map
-import qualified Distribution.Package as Cabal
import qualified Distribution.Simple.PackageIndex as Cabal
import qualified Portage.Overlay as Portage
-import qualified Portage.PackageId as Portage
fromOverlay :: Portage.Overlay -> Cabal.PackageIndex Portage.ExistingEbuild
fromOverlay overlay = Cabal.fromList $
[ ebuild
- | (pn, ebuilds) <- Map.toAscList (Portage.overlayMap overlay)
+ | (_pn, ebuilds) <- Map.toAscList (Portage.overlayMap overlay)
, ebuild <- ebuilds
]
View
@@ -12,8 +12,7 @@ import qualified Portage.Version as Portage
import qualified Distribution.Package as Cabal
-import qualified Distribution.Simple.PackageIndex as PackageIndex
--- import Distribution.Simple.PackageIndex (PackageIndex)
+-- import qualified Distribution.Simple.PackageIndex as PackageIndex
import Distribution.Text (simpleParse, display)
import Distribution.Simple.Utils ( comparing, equating )
@@ -62,10 +61,11 @@ inOverlay overlay pkgId = not (Map.null packages)
load :: FilePath -> IO Overlay
load dir = fmap (mkOverlay . readOverlay) (getDirectoryTree dir)
where
- mkOverlay packages = Overlay {
+ mkOverlay _packages = Overlay {
overlayPath = dir
-- TODO: ignore all ebuilds that have no Cabal version number
--- overlayIndex = PackageIndex.fromList packages
+-- , overlayIndex = PackageIndex.fromList packages
+ , overlayMap = undefined
}
loadLazy :: FilePath -> IO Overlay
View
@@ -12,11 +12,6 @@ module Portage.PackageId (
normalizeCabalPackageId
) where
-import qualified Data.Char as Char (isAlphaNum, isDigit, isSpace, toLower)
-import Data.List (intersperse)
-import qualified Text.PrettyPrint as Disp
-import Text.PrettyPrint ((<>))
-
import qualified Distribution.Package as Cabal
import Distribution.Text (Text(..),display)
@@ -26,8 +21,9 @@ import qualified Portage.Version as Portage
import qualified Text.PrettyPrint as Disp
import Text.PrettyPrint ((<>))
-import qualified Data.Char as Char (isAlphaNum, isDigit, isSpace, toLower)
-import Data.List (intersperse)
+import qualified Data.Char as Char (isAlphaNum, isSpace, toLower)
+-- import qualified Data.Char as Char (isDigit)
+-- import Data.List (intersperse)
newtype Category = Category { unCategory :: String }
deriving (Eq, Ord, Show, Read)

0 comments on commit 1cec758

Please sign in to comment.