Fix import and style

Author: Kleidukos

Cabal/src/Distribution/PackageDescription/Check.hs

@@ -70,7 +70,7 @@ import System.FilePath
 
 import qualified Data.ByteString.Lazy      as BS
 import qualified Data.Map                  as Map
-import qualified Control.Monad as CM
+import qualified Control.Monad             as CM
 import qualified Distribution.Compat.DList as DList
 import qualified Distribution.SPDX         as SPDX
 import qualified System.Directory          as System

cabal-install/cabal-install.cabal

@@ -336,7 +336,7 @@ test-suite unit-tests
           tasty-quickcheck,
           tasty-hunit >= 0.10,
           tree-diff,
-          QuickCheck >= 2.14 && <2.15
+          QuickCheck >= 2.14.3 && <2.15
 
 
 -- Tests to run with a limited stack and heap size

cabal-install/tests/UnitTests/Distribution/Client/ArbitraryInstances.hs

@@ -44,7 +44,7 @@ import Distribution.Solver.Types.PackageConstraint       (PackageProperty (..))
 import Data.Coerce                      (Coercible, coerce)
 import Network.URI                      (URI (..), URIAuth (..), isUnreserved)
 import Test.QuickCheck
-import Test.QuickCheck.GenericArbitrary
+import Test.QuickCheck.GenericArbitrary (genericArbitrary)
 import Test.QuickCheck.Instances.Cabal ()
 
 -- note: there are plenty of instances defined in ProjectConfig test file.
@@ -107,11 +107,6 @@ arbitraryURIPort =
 -- cabal-install (and Cabal) types
 -------------------------------------------------------------------------------
 
-shrinkBoundedEnum :: (Eq a, Enum a, Bounded a) => a -> [a]
-shrinkBoundedEnum x
-    | x == minBound = []
-    | otherwise     = [pred x]
-
 adjustSize :: (Int -> Int) -> Gen a -> Gen a
 adjustSize adjust gen = sized (\n -> resize (adjust n) gen)