@@ -901,18 +901,18 @@ dmapEncoder :: forall check parse k k' v.
901901 -> Encoder check parse (DMap k' Identity) (Map k v)
902902dmapEncoder keyEncoder' valueEncoderFor = unsafeEncoder $ do
903903 keyEncoder :: Encoder Identity parse (Some k') k <- checkEncoder keyEncoder'
904− valueDecoders :: DMap k' (Decoder Identity parse v) <- fmap DMap.fromList . forM universe $ \(Some.This (k' :: k' t)) -> do
904+ valueDecoders :: DMap k' (Decoder Identity parse v) <- fmap DMap.fromList . forM universe $ \(Some (k' :: k' t)) -> do
905905 ve :: Encoder Identity parse t v <- checkEncoder (valueEncoderFor k')
906906 return $ (k' :: k' t) :=> (Decoder ve :: Decoder Identity parse v t)
907907 let keyError k = "dmapEncoder: key `" <> k <> "' was missing from the Universe instance for its type."
908908 return $ EncoderImpl
909909 { _encoderImpl_encode = \dm -> Map.fromList $ do
910910 ((k' :: k' t) :=> Identity v') <- DMap.toList dm
911− return ( encode keyEncoder (Some.This k')
911+ return ( encode keyEncoder (Some k')
912912 , encode (toEncoder (DMap.findWithDefault (error . keyError $ gshow k') k' valueDecoders)) v'
913913 )
914914 , _encoderImpl_decode = \m -> fmap DMap.fromList . forM (Map.toList m) $ \(k,v) -> do
915− Some.This (k' :: k' t) <- tryDecode keyEncoder k
915+ Some (k' :: k' t) <- tryDecode keyEncoder k
916916 case DMap.lookup k' valueDecoders of
917917 Nothing -> throwError . T.pack . keyError $ gshow k'
918918 Just (Decoder e) -> do
@@ -931,7 +931,7 @@ fieldMapEncoder :: forall check parse r.
931931 => Encoder check parse r (DMap (Field r) Identity)
932932fieldMapEncoder = unsafeEncoder $ do
933933 pure $ EncoderImpl
934− { _encoderImpl_encode = \r -> DMap.fromList [ f :=> Identity (indexField r f) | Some.This f <- universe ]
934+ { _encoderImpl_encode = \r -> DMap.fromList [ f :=> Identity (indexField r f) | Some f <- universe ]
935935 , _encoderImpl_decode = \dm -> tabulateFieldsA $ \f -> do
936936 case DMap.lookup f dm of
937937 Nothing -> throwError $ "fieldMapEncoder: Couldn't find key for `" <> T.pack (gshow f) <> "' in DMap."
@@ -948,8 +948,8 @@ jsonEncoder :: forall check parse r.
948948 => Encoder check parse r Text
949949jsonEncoder = unsafeEncoder $ do
950950 pure $ EncoderImpl
951− { _encoderImpl_encode = \r -> decodeUtf8 . BSL.toStrict $ Aeson.encode r
952− , _encoderImpl_decode = \t -> case Aeson.eitherDecodeStrict $ encodeUtf8 t of
951+ { _encoderImpl_encode = \r -> T.decodeUtf8 . BSL.toStrict $ Aeson.encode r
952+ , _encoderImpl_decode = \t -> case Aeson.eitherDecodeStrict $ T.encodeUtf8 t of
953953 Left err -> throwError ("jsonEncoder: " <> T.pack err)
954954 Right x -> return x
955955 }