feature: upgrade to lts-22.43

- fixed a test for checking the priority of specializations
- fixed how some values are displayed due to the upgrade
- bumped some dependencies because of the upgrade

Author: etorreborre

.envrc

@@ -1 +1 @@
-. <(flox activate -d $XDG_STATE_HOME/flox/haskell)
+eval "$(flox activate -d $FLOX/haskell)"

package.yaml

@@ -1,5 +1,5 @@
 name: registry
-version: 0.6.1.0
+version: 0.6.2.0
 synopsis: data structure for assembling components
 
 description: This library provides a "Registry" which is a data structure containing
@@ -53,8 +53,8 @@ dependencies:
   - mmorph                >= 1.0  && < 2
   - multimap              >= 1.0  && < 2
   - protolude             >= 0.2  && < 0.4
-  - resourcet             >= 1.1  && < 1.3
-  - semigroupoids         >= 5.0  && < 5.4
+  - resourcet             >= 1.1  && < 2
+  - semigroupoids         >= 5.0  && < 7
   - semigroups            >= 0.15 && < 0.30
   - template-haskell      >= 2.13 && < 3.0
   - text                  >= 1.1  && < 3

registry.cabal

@@ -1,10 +1,10 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 58716f09f121c810611a3d1fcee02e0347cc257f2e77c051d7990b4367e346f4
+-- hash: 2a0efc6bb21e7c5e914a1968aadce02745a9842fc47f9146b2be506788fec102
 
 name:           registry
 version:        0.6.1.0
@@ -71,8 +71,8 @@ library
     , mtl >=2.0 && <3
     , multimap >=1.0 && <2
     , protolude >=0.2 && <0.4
-    , resourcet >=1.1 && <1.3
-    , semigroupoids >=5.0 && <5.4
+    , resourcet >=1.1 && <2
+    , semigroupoids >=5.0 && <7
     , semigroups >=0.15 && <0.30
     , template-haskell >=2.13 && <3.0
     , text >=1.1 && <3
@@ -148,8 +148,8 @@ test-suite spec
     , protolude >=0.2 && <0.4
     , random <2.0
     , registry
-    , resourcet >=1.1 && <1.3
-    , semigroupoids >=5.0 && <5.4
+    , resourcet >=1.1 && <2
+    , semigroupoids >=5.0 && <7
     , semigroups <0.30
     , tasty <1.5
     , tasty-discover <6

src/Data/Registry/Internal/Reflection.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE DataKinds #-}
 
 -- |
 --  Utility functions to display or manipulate types
@@ -94,10 +95,10 @@ mustShowModuleName name =
 
 -- | Tweak some standard module names for better display
 tweakNested :: Text -> Text
-tweakNested "[] Char" = "String"
+tweakNested "List Char" = "String"
 tweakNested n =
-  if "[] " `isPrefixOf` n
-    then "[" <> T.drop 3 n <> "]" -- special processing for lists
+  if "List " `isPrefixOf` n
+    then "[" <> T.drop 5 n <> "]" -- special processing for lists
     else n
 
 -- | This is an attempt to better render "nested" types like IO (Maybe Text)

src/Data/Registry/Internal/Types.hs

@@ -448,7 +448,7 @@ data SpecializationRange = SpecializationRange
 --   See TypesSpec for some concrete examples.
 instance Ord SpecializationRange where
   SpecializationRange s1 e1 <= SpecializationRange s2 e2
-    | e1 /= s1 && e2 /= s2 = e1 <= e2 || (e1 == e2 && s1 <= s2)
+    | e1 /= s1 && e2 /= s2 = e1 < e2 || (e1 == e2 && s1 <= s2)
     | e1 == s1 && e2 /= s2 = e1 < e2
     | otherwise = e1 <= e2
 

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-21.22
+resolver: lts-22.43
 
 packages:
 - '.'

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    sha256: afd5ba64ab602cabc2d3942d3d7e7dd6311bc626dcb415b901eaf576cb62f0ea
-    size: 640060
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/22.yaml
-  original: lts-21.22
+    sha256: 08bd13ce621b41a8f5e51456b38d5b46d7783ce114a50ab604d6bbab0d002146
+    size: 720271
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/43.yaml
+  original: lts-22.43

test/Test/Data/Registry/Internal/TypesSpec.hs

@@ -9,7 +9,7 @@ import Protolude as P
 
 import Test.Tasty.Extensions
 
-test_specialized_context_order = prop "there are preferrable specializations than other in a given context" $ do
+test_specialized_context_order = prop "there are preferable specializations than others in a given context" $ do
   let c1 = Context (fmap (\t -> (t, Nothing)) $ [f, e, d, c, b, a])
   let s1 = specializationRange c1 (Specialization (a :| [c]) (UntypedValue $ createValue A))
   let s2 = specializationRange c1 (Specialization (a :| [e]) (UntypedValue $ createValue A))
@@ -22,8 +22,7 @@ test_specialized_context_order = prop "there are preferrable specializations tha
   (s3 < s1) === True
   (s4 < s1) === True
   (s3 < s2) === True
-  (s4 < s2) === True
-  (s4 < s3) === True
+  (s3 < s4) === True
   (s1 < s5) === True
   (s6 < s5) === True