Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/27fd8483868b37ab23b045a405c670afeba2e369 >--------------------------------------------------------------- commit 27fd8483868b37ab23b045a405c670afeba2e369 Author: Andres Loeh <[email protected]> Date: Sat Oct 29 14:11:33 2011 +0000 removing dead code >--------------------------------------------------------------- .../Client/Dependency/Modular/Index.hs | 4 ---- .../Client/Dependency/Modular/Preference.hs | 8 -------- 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/cabal-install/Distribution/Client/Dependency/Modular/Index.hs b/cabal-install/Distribution/Client/Dependency/Modular/Index.hs index 6587664..6b4f05f 100644 --- a/cabal-install/Distribution/Client/Dependency/Modular/Index.hs +++ b/cabal-install/Distribution/Client/Dependency/Modular/Index.hs @@ -7,7 +7,6 @@ import Prelude hiding (pi) import Distribution.Client.Dependency.Modular.Dependency import Distribution.Client.Dependency.Modular.Flag import Distribution.Client.Dependency.Modular.Package -import Distribution.Client.Dependency.Modular.Version -- | An index contains information about package instances. This is a nested -- dictionary. Package names are mapped to instances, which in turn is mapped @@ -19,9 +18,6 @@ type Index = Map PN (Map I PInfo) data PInfo = PInfo (FlaggedDeps PN) FlagDefaults Encaps deriving (Show) --- | A separate index just containing preference constraints for packages. -type Preferences = Map PN VR - -- | Encapsulations. A list of package names. type Encaps = [PN] diff --git a/cabal-install/Distribution/Client/Dependency/Modular/Preference.hs b/cabal-install/Distribution/Client/Dependency/Modular/Preference.hs index 593738f..be17113 100644 --- a/cabal-install/Distribution/Client/Dependency/Modular/Preference.hs +++ b/cabal-install/Distribution/Client/Dependency/Modular/Preference.hs @@ -12,7 +12,6 @@ import Distribution.Client.Dependency.Types import Distribution.Client.Dependency.Modular.Dependency import Distribution.Client.Dependency.Modular.Flag -import Distribution.Client.Dependency.Modular.Index import Distribution.Client.Dependency.Modular.Package import Distribution.Client.Dependency.Modular.PSQ as P import Distribution.Client.Dependency.Modular.Tree @@ -28,13 +27,6 @@ packageOrderFor p cmp = trav go | otherwise = PChoiceF v r cs go x = x --- | Reorder according to global preferences. -preferPreferences :: Preferences -> Tree a -> Tree a -preferPreferences prefs = packageOrderFor (`M.member` prefs) preference - where - preference pn (I v1 _) (I v2 _) = preferredVersionsOrdering preferred v1 v2 - where preferred = M.findWithDefault anyVR pn prefs - -- | Ordering that treats preferred versions as greater than non-preferred -- versions. preferredVersionsOrdering :: VR -> Ver -> Ver -> Ordering _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
