Removes a smattering of, apparent, dead code.

Using weeder to find unused definitions. There are a great many more,
but this was an attempt to be relatively conservative in the removal.

Cabal-described/src/Distribution/Described.hs

@@ -13,7 +13,6 @@ module Distribution.Described (
     reMunch1CS,
     -- * Variables
     reVar0,
-    reVar1,
     -- * Special expressions
     reDot,
     reComma,

Cabal-described/src/Distribution/Utils/CharSet.hs

@@ -17,12 +17,9 @@ module Distribution.Utils.CharSet (
     difference,
     -- * Query
     size,
-    null,
-    member,
     -- * Conversions
     fromList,
     toList,
-    fromIntervalList,
     toIntervalList,
     -- * Special lists
     alpha,
@@ -31,12 +28,12 @@ module Distribution.Utils.CharSet (
     ) where
 
 import Data.Char                     (chr, isAlpha, isAlphaNum, isUpper, ord)
-import Data.List                     (foldl', sortBy)
+import Data.List                     (foldl')
 import Data.Monoid                   (Monoid (..))
 import Data.String                   (IsString (..))
 import Distribution.Compat.Semigroup (Semigroup (..))
 import Prelude
-       (Bool (..), Bounded (..), Char, Enum (..), Eq (..), Int, Maybe (..), Num (..), Ord (..), Show (..), String, concatMap, flip, fst, otherwise, showParen,
+       (Bounded (..), Char, Enum (..), Eq (..), Int, Num (..), Ord (..), Show (..), String, concatMap, flip, otherwise, showParen,
        showString, uncurry, ($), (.))
 
 #if MIN_VERSION_containers(0,5,0)
@@ -78,40 +75,15 @@ empty = CS IM.empty
 universe :: CharSet
 universe = CS $ IM.singleton 0 0x10ffff
 
--- | Check whether 'CharSet' is 'empty'.
-null :: CharSet -> Bool
-null (CS cs) = IM.null cs
-
 -- | Size of 'CharSet'
 --
--- >>> size $ fromIntervalList [('a','f'), ('0','9')]
--- 16
---
--- >>> length $ toList $ fromIntervalList [('a','f'), ('0','9')]
--- 16
---
 size :: CharSet -> Int
 size (CS m) = foldl' (\ !acc (lo, hi) -> acc + (hi - lo) + 1) 0 (IM.toList m)
 
 -- | Singleton character set.
 singleton :: Char -> CharSet
 singleton c = CS (IM.singleton (ord c) (ord c))
 
--- | Test whether character is in the set.
-member :: Char -> CharSet -> Bool
-#if MIN_VERSION_containers(0,5,0)
-member c (CS m) = case IM.lookupLE i m of
-    Nothing      -> False
-    Just (_, hi) -> i <= hi
-  where
-#else
-member c (CS m) = go (IM.toList m)
-  where
-    go [] = False
-    go ((x,y):zs) = (x <= i && i <= y) || go zs
-#endif
-    i = ord c
-
 -- | Insert 'Char' into 'CharSet'.
 insert :: Char -> CharSet -> CharSet
 insert c (CS m) = normalise (IM.insert (ord c) (ord c) m)
@@ -179,24 +151,6 @@ toList = concatMap (uncurry enumFromTo) . toIntervalList
 toIntervalList :: CharSet -> [(Char, Char)]
 toIntervalList (CS m) = [ (chr lo, chr hi) | (lo, hi) <- IM.toList m ]
 
--- | Convert from interval pairs.
---
--- >>> fromIntervalList []
--- ""
---
--- >>> fromIntervalList [('a','f'), ('0','9')]
--- "0123456789abcdef"
---
--- >>> fromIntervalList [('Z','A')]
--- ""
---
-fromIntervalList :: [(Char,Char)] -> CharSet
-fromIntervalList xs = normalise' $ sortBy (\a b -> compare (fst a) (fst b))
-    [ (ord lo, ord hi)
-    | (lo, hi) <- xs
-    , lo <= hi
-    ]
-
 -------------------------------------------------------------------------------
 -- Normalisation
 -------------------------------------------------------------------------------

Cabal-tests/Cabal-tests.cabal

@@ -30,7 +30,6 @@ test-suite unit-tests
   hs-source-dirs:   tests
   other-modules:
     Test.Laws
-    Test.QuickCheck.Utils
     UnitTests.Distribution.CabalSpecVersion
     UnitTests.Distribution.Compat.Graph
     UnitTests.Distribution.Compat.Time

Cabal-tests/tests/UnitTests/Distribution/Version.hs

@@ -23,7 +23,6 @@ import Test.Tasty                      (TestTree)
 import Test.Tasty.QuickCheck           (testProperty)
 
 import qualified Distribution.Types.VersionInterval        as New
-import qualified Distribution.Types.VersionInterval.Legacy as Old
 import qualified Text.PrettyPrint                          as Disp
 
 versionTests :: [TestTree]
@@ -44,7 +43,6 @@ versionTests =
     , tp "normaliseVersionRange involutive"                    prop_normalise_inv
     , tp "normaliseVersionRange equivalent"                    prop_normalise_equiv
     , tp "normaliseVersionRange caretequiv"                    prop_normalise_caret_equiv
-    , tp "normaliseVersionRange model"                         prop_normalise_model
 
     , tp "simplifyVersionRange involutive"                     prop_simplify_inv
     , tp "simplifyVersionRange equivalent"                     prop_simplify_equiv
@@ -160,18 +158,6 @@ prop_normalise_caret_equiv vr = prop_equivalentVersionRange
     (transformCaretUpper vr)
     (transformCaretUpper (normaliseVersionRange vr))
 
-prop_normalise_model :: VersionRange -> Property
-prop_normalise_model vr =
-    oldNormaliseVersionRange vr' === newNormaliseVersionRange vr'
-  where
-    vr' = transformCaret vr
-
-    oldNormaliseVersionRange :: VersionRange -> VersionRange
-    oldNormaliseVersionRange = Old.fromVersionIntervals . Old.toVersionIntervals
-
-    newNormaliseVersionRange :: VersionRange -> VersionRange
-    newNormaliseVersionRange = New.normaliseVersionRange2
-
 prop_simplify_inv :: VersionRange -> Property
 prop_simplify_inv vr =
     simplifyVersionRange vr === simplifyVersionRange (simplifyVersionRange vr)

cabal-benchmarks/bench/CabalBenchmarks.hs

@@ -8,7 +8,6 @@ import Distribution.Version
 
 import qualified Data.ByteString as BS
 
-import qualified Distribution.Types.VersionInterval.Legacy as Old
 import qualified Distribution.Types.VersionInterval        as New
 
 -------------------------------------------------------------------------------
@@ -38,7 +37,6 @@ main = defaultMain
                 , env bigVersionRangeA $ \vr -> bench "pat4" $ nf f vr
                 ]
         in  [ suite "def" normaliseVersionRange
-            , suite "old" oldNormaliseVersionRange
             , suite "new" newNormaliseVersionRange
             ]
     ]
@@ -47,9 +45,6 @@ main = defaultMain
 -- VersionRanges normalisation
 -------------------------------------------------------------------------------
 
-oldNormaliseVersionRange :: VersionRange -> VersionRange
-oldNormaliseVersionRange = Old.fromVersionIntervals . Old.toVersionIntervals
-
 newNormaliseVersionRange :: VersionRange -> VersionRange
 newNormaliseVersionRange = New.normaliseVersionRange2