Use 'adjust' from 'typerep-map'

int-index · Aug 20, 2018 · 6938f8d · 6938f8d
1 parent ce892d9
commit 6938f8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/caps.cabal b/caps.cabal
@@ -13,7 +13,7 @@ library
   exposed-modules:     Monad.Capabilities
   build-depends:       base >=4.10 && <4.12,
                        transformers,
-                       typerep-map >=0.2,
+                       typerep-map >=0.3,
                        template-haskell
   hs-source-dirs:      src
   default-language:    Haskell2010

diff --git a/src/Monad/Capabilities.hs b/src/Monad/Capabilities.hs
@@ -177,7 +177,7 @@ import Data.Proxy
 import Data.Type.Equality
 import Data.List (foldl1')
 import GHC.TypeLits (TypeError, ErrorMessage(..))
-import Type.Reflection (Typeable, typeRep)
+import Type.Reflection (Typeable)
 import Unsafe.Coerce (unsafeCoerce)
 
 import qualified Data.TypeRepMap as TypeRepMap
@@ -456,14 +456,7 @@ adjustCap ::
   Capabilities caps m ->
   Capabilities caps m
 adjustCap f (Capabilities caps) =
-  Capabilities (TypeRepMap.hoistWithKey adj caps)
-  where
-    -- TODO: use 'TypeRepMap.adjust' when it is implemented, see #48
-    adj :: forall x. Typeable x => CapElem m x -> CapElem m x
-    adj =
-      case testEquality (typeRep @cap) (typeRep @x) of
-        Just Refl -> overCapElem f
-        Nothing -> id
+  Capabilities (TypeRepMap.adjust (overCapElem f) caps)
 
 -- | Extract a capability from 'CapsT' and provide it to a continuation.
 withCap :: (Typeable cap, HasCap cap caps) => (cap (CapsT caps m) -> CapsT caps m a) -> CapsT caps m a