.cabal: Reorganize constraints, allow base-4.16 in testsuite

The constraints have been reorganized according to these principles:

- mention dependency on top-level if mentioned in all branches of a conditional
- do not repeat constraints in test-suite that are inherited from library
- order each dependency group alphabetically (but `base` and parent go first)
- format with leading comma (harder to make mistakes)
- align at >= and &&

Author: andreasabel

HTTP.cabal

@@ -1,7 +1,7 @@
+Cabal-Version: >= 1.10
 Name: HTTP
 Version: 4000.3.16
 x-revision: 1
-Cabal-Version: >= 1.10
 Build-type: Simple
 License: BSD3
 License-file: LICENSE
@@ -57,7 +57,10 @@ Description:
 
 Extra-Source-Files: CHANGES
 
-tested-with: GHC==9.0.1, GHC==8.10.4, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.2.2, GHC==7.0.4
+tested-with:
+  GHC==9.2.1, GHC==9.0.1,
+  GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2,
+  GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.2.2, GHC==7.0.4
 
 Source-Repository head
   type: git
@@ -110,23 +113,30 @@ Library
 
   -- note the test harness constraints should be kept in sync with these
   -- where dependencies are shared
-  Build-depends: base >= 4.3.0.0 && < 4.17, parsec >= 2.0 && < 3.2
-  Build-depends: array >= 0.3.0.2 && < 0.6, bytestring >= 0.9.1.5 && < 0.12
-  Build-depends: time >= 1.1.2.3 && < 1.13
+  build-depends:
+      base        >= 4.3.0.0  && < 4.17
+    , array       >= 0.3.0.2  && < 0.6
+    , bytestring  >= 0.9.1.5  && < 0.12
+    , parsec      >= 2.0      && < 3.2
+    , time        >= 1.1.2.3  && < 1.13
+    -- The following dependencies are refined by flags, but they should
+    -- still be mentioned here on the top-level.
+    , mtl         >= 1.1.1.0  && < 2.3
+    , network     >= 2.4      && < 3.2
 
   default-language: Haskell98
   default-extensions: FlexibleInstances
 
   if flag(mtl1)
-    Build-depends: mtl >= 1.1.1.0 && < 1.2
+    Build-depends: mtl < 1.2
     CPP-Options: -DMTL1
   else
-    Build-depends: mtl >= 2.0 && < 2.3
+    Build-depends: mtl >= 2.0
 
   if flag(network-uri)
-    Build-depends: network-uri == 2.6.*, network >= 2.6 && < 3.2
+    Build-depends: network-uri == 2.6.*, network >= 2.6
   else
-    Build-depends: network >= 2.4 && < 2.6
+    Build-depends: network < 2.6
 
   if flag(warn-as-error)
     ghc-options:      -Werror
@@ -147,37 +157,37 @@ Test-Suite test
 
   ghc-options: -Wall
 
-  -- note: version constraints for dependencies shared with the library
-  -- should be the same
-  build-depends:     HTTP,
-                     HUnit >= 1.2.0.1 && < 1.7,
-                     httpd-shed >= 0.4 && < 0.5,
-                     mtl >= 1.1.1.0 && < 2.3,
-                     bytestring >= 0.9.1.5 && < 0.12,
-                     deepseq >= 1.3.0.0 && < 1.5,
-                     pureMD5 >= 0.2.4 && < 2.2,
-                     base >= 4.3.0.0 && < 4.16,
-                     split >= 0.1.3 && < 0.3,
-                     test-framework >= 0.2.0 && < 0.9,
-                     test-framework-hunit >= 0.3.0 && <0.4
+  build-depends:
+      HTTP
+    -- constraints inherited from HTTP
+    , base
+    , bytestring
+    , mtl
+    , network
+    -- extra dependencies
+    , deepseq               >= 1.3.0.0  && < 1.5
+    , httpd-shed            >= 0.4      && < 0.5
+    , HUnit                 >= 1.2.0.1  && < 1.7
+    , pureMD5               >= 0.2.4    && < 2.2
+    , split                 >= 0.1.3    && < 0.3
+    , test-framework        >= 0.2.0    && < 0.9
+    , test-framework-hunit  >= 0.3.0    && < 0.4
 
   if flag(network-uri)
-    Build-depends: network-uri == 2.6.*, network >= 2.6 && < 3.2
+    Build-depends: network-uri == 2.6.*, network >= 2.6
   else
-    Build-depends: network >= 2.3 && < 2.6
+    Build-depends: network < 2.6
 
   if flag(warp-tests)
     CPP-Options: -DWARP_TESTS
     build-depends:
-                       case-insensitive >= 0.4.0.1 && < 1.3,
-                       http-types >= 0.8.0 && < 1.0,
-                       wai >= 2.1.0 && < 3.3,
-                       warp >= 2.1.0 && < 3.4
+        case-insensitive    >= 0.4.0.1  && < 1.3
+      , conduit             >= 1.0.8    && < 1.4
+      , http-types          >= 0.8.0    && < 1.0
+      , wai                 >= 2.1.0    && < 3.3
+      , warp                >= 2.1.0    && < 3.4
 
     if flag(conduit10)
-      build-depends:
-                         conduit >= 1.0.8 && < 1.1
+      build-depends: conduit < 1.1
     else
-      build-depends:
-                         conduit >= 1.1 && < 1.4,
-                         conduit-extra >= 1.1 && < 1.4
+      build-depends: conduit >= 1.1, conduit-extra >= 1.1 && < 1.4