Merge pull request #96 from tweag/ghc-9.0-compatibility

Compatibility with GHC 9.0

Author: aherrmann

.github/workflows/ci.yaml

@@ -23,8 +23,8 @@ jobs:
           ~/.cabal/packages
           ~/.cabal/store
           dist-newstyle
-        key: cache-${{ runner.os }}-${{ hashFiles('nixpkgs.nix') }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('linear-base.cabal') }}-${{ github.sha }}
-        restore-keys: cache-${{ runner.os }}-${{ hashFiles('nixpkgs.nix') }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('linear-base.cabal') }}-
+        key: cache-${{ runner.os }}-${{ hashFiles('nixpkgs.nix') }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('capability.cabal') }}-${{ github.sha }}
+        restore-keys: cache-${{ runner.os }}-${{ hashFiles('nixpkgs.nix') }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('capability.cabal') }}-
     - name: Update Cabal's database
       run: $NIXSHELL --run "cabal update"
     - name: Build Cabal's dependencies
@@ -35,3 +35,18 @@ jobs:
       run: $NIXSHELL --run "cabal --flag=dev test"
     - name: Haddock
       run: $NIXSHELL --run "cabal haddock"
+
+  stack-ghc9:
+    name: Build on GHC 9.0
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/[email protected]
+    - name: Cache dependencies
+      uses: actions/[email protected]
+      with:
+        path: ~/.stack
+        key: stack-ghc9-${{ runner.os }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('stack-ghc9.yaml.lock', 'capability.cabal') }}
+    - name: Upgrade stack
+      run: stack upgrade
+    - name: Build
+      run: stack --stack-yaml=stack-ghc9.yaml build --pedantic --test --bench --no-run-tests --no-run-benchmarks

capability.cabal

@@ -58,7 +58,6 @@ library
     Capability.Stream
     Capability.TypeOf
     Capability.Writer
-    Capability.Writer.Discouraged
   build-depends:
       base >= 4.14 && < 5.0
     , constraints >= 0.1 && < 0.14
@@ -67,7 +66,6 @@ library
     , generic-lens >= 2.0 && < 2.2
     , lens >= 4.16 && < 5.1
     , monad-control >= 1.0 && < 1.1
-    , monad-unlift >= 0.2 && < 0.3
     , mtl >= 2.0 && < 3.0
     , mutable-containers >= 0.3 && < 0.4
     , primitive >= 0.6 && < 0.8

src/Capability.hs

@@ -103,11 +103,6 @@
 -- The use of tags allows one to have independent effects that share a superclass.
 -- E.g. @HasState "foo" Int@ and @HasWriter "bar" String@.
 --
--- Some of the capability modules have a “discouraged” companion (such as
--- "Capability.Writer.Discouraged"). These modules contain deriving-via
--- combinators which you can use if you absolutely must: they are correct, but
--- inefficient, so we recommend that you do not.
---
 -- Finally there are
 --
 -- * "Capability.Derive"

src/Capability/Error.hs

@@ -174,8 +174,8 @@ wrapError :: forall innertag t (cs :: [Capability]) inner m a.
   , HasCatch innertag inner (t m)
   , All cs m)
   => (forall m'. All (HasCatch innertag inner ': cs) m' => m' a) -> m a
-wrapError =
-  derive @t @'[HasCatch innertag inner] @cs
+wrapError action =
+  derive @t @'[HasCatch innertag inner] @cs action
 {-# INLINE wrapError #-}
 
 -- XXX: Does it make sense to add a HasMask capability similar to @MonadMask@?

src/Capability/Reader/Internal/Class.hs

@@ -107,8 +107,8 @@ magnify :: forall innertag t (cs :: [Capability]) inner m a.
   , HasReader innertag inner (t m)
   , All cs m)
   => (forall m'. All (HasReader innertag inner ': cs) m' => m' a) -> m a
-magnify =
-  derive @t @'[HasReader innertag inner] @cs
+magnify action =
+  derive @t @'[HasReader innertag inner] @cs action
 {-# INLINE magnify #-}
 
 --------------------------------------------------------------------------------

src/Capability/Reflection.hs

@@ -73,7 +73,7 @@ interpret_ ::
   Reified tag c m ->
   (forall m'. c m' => m' a) ->
   m a
-interpret_ = interpret @tag @'[] @c
+interpret_ dict action = interpret @tag @'[] @c dict action
 {-# INLINE interpret_ #-}
 
 -- | @interpret \@tag \@ambient dict action@

src/Capability/State/Internal/Class.hs

@@ -132,8 +132,8 @@ zoom :: forall innertag t (cs :: [Capability]) inner m a.
   , HasState innertag inner (t m)
   , All cs m )
   => (forall m'. All (HasState innertag inner ': cs) m' => m' a) -> m a
-zoom =
-  derive @t @'[HasState innertag inner] @cs
+zoom action =
+  derive @t @'[HasState innertag inner] @cs action
 {-# INLINE zoom #-}
 
 --------------------------------------------------------------------------------

src/Capability/Writer/Discouraged.hs

@@ -0,0 +1,12 @@
+resolver: nightly-2021-07-04
+
+packages:
+- .
+
+extra-deps:
+# Generic-lens is not yet released in a 9.0-compatible version
+- git: https://github.com/kcsongor/generic-lens.git
+  commit: 8e1fc7dcf444332c474fca17110d4bc554db08c8
+  subdirs:
+  - generic-lens-core
+  - generic-lens

stack-ghc9.yaml

@@ -0,0 +1,38 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages:
+- completed:
+    subdir: generic-lens-core
+    name: generic-lens-core
+    version: 2.1.0.0
+    git: https://github.com/kcsongor/generic-lens.git
+    pantry-tree:
+      size: 2283
+      sha256: 5a26b16c38ad8d8ebc81182e1d09858858f16dc117a0c7b084d8446d3a17d749
+    commit: 8e1fc7dcf444332c474fca17110d4bc554db08c8
+  original:
+    subdir: generic-lens-core
+    git: https://github.com/kcsongor/generic-lens.git
+    commit: 8e1fc7dcf444332c474fca17110d4bc554db08c8
+- completed:
+    subdir: generic-lens
+    name: generic-lens
+    version: 2.1.0.0
+    git: https://github.com/kcsongor/generic-lens.git
+    pantry-tree:
+      size: 2630
+      sha256: aba81557550537d4cfda2c1b07accff8589da44a1e418a3cde5639eb438d1c86
+    commit: 8e1fc7dcf444332c474fca17110d4bc554db08c8
+  original:
+    subdir: generic-lens
+    git: https://github.com/kcsongor/generic-lens.git
+    commit: 8e1fc7dcf444332c474fca17110d4bc554db08c8
+snapshots:
+- completed:
+    size: 540164
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/7/4.yaml
+    sha256: 195e3e9394de03e724525e210f82e30c4488f7c8a09fc70850d75d8b79332993
+  original: nightly-2021-07-04