[commit: Cabal] master: Remove now-unused utilities from World module (c12fb4b)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c12fb4b607eb682104f7088849296b9a1b8dd2c5

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

commit c12fb4b607eb682104f7088849296b9a1b8dd2c5
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Sun Feb 13 22:50:41 2011 +0000

    Remove now-unused utilities from World module
    No longer needed now that the world target is handled via UserTarget.

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

 cabal-install/Distribution/Client/World.hs |   29 +---------------------------
 1 files changed, 1 insertions(+), 28 deletions(-)

diff --git a/cabal-install/Distribution/Client/World.hs b/cabal-install/Distribution/Client/World.hs
index 4557e66..12cfab2 100644
--- a/cabal-install/Distribution/Client/World.hs
+++ b/cabal-install/Distribution/Client/World.hs
@@ -27,19 +27,12 @@ module Distribution.Client.World (
     insert,
     delete,
     getContents,
-
-    worldPkg,
-    isWorldTarget,
-    isGoodWorldTarget,
   ) where
 
-import Distribution.Client.Types
-    ( UnresolvedDependency(..) )
 import Distribution.Package
-         ( PackageName(..), Dependency(..) )
+         ( Dependency(..) )
 import Distribution.PackageDescription
          ( FlagAssignment, FlagName(FlagName) )
-import Distribution.Version( anyVersion )
 import Distribution.Verbosity
          ( Verbosity )
 import Distribution.Simple.Utils
@@ -130,26 +123,6 @@ getContents world = do
                 | otherwise             = ioError e
 
 
--- | A dummy package that represents the world file.
-worldPkg :: PackageName
-worldPkg = PackageName "world"
-
--- | Currently we have a silly way of representing the world target as
--- an 'UnresolvedDependency' so we need a way to recognise it.

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

--- We should be using a structured type with various target kinds, like
--- local file, repo package etc.

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

-isWorldTarget :: UnresolvedDependency -> Bool
-isWorldTarget (UnresolvedDependency (Dependency pkg _) _) =
-  pkg == worldPkg
-
-isGoodWorldTarget :: UnresolvedDependency -> Bool
-isGoodWorldTarget (UnresolvedDependency (Dependency pkg ver) flags) =
-     pkg == worldPkg
-  && ver == anyVersion
-  && null flags
-
 instance Text WorldPkgInfo where
   disp (WorldPkgInfo dep flags) = disp dep <+> dispFlags flags
     where