diff --git a/lib/Polysemy/Log/Di/Di.hs b/lib/Polysemy/Log/Di/Di.hs --- a/lib/Polysemy/Log/Di/Di.hs +++ b/lib/Polysemy/Log/Di/Di.hs @@ -6,13 +6,13 @@ import Polysemy.Internal.Tactics (liftT) import Polysemy.Time (GhcTime) -import Polysemy.Log.Effect.DataLog (DataLog (DataLog, Local)) -import Polysemy.Log.Effect.Log (Log) import qualified Polysemy.Log.Data.LogEntry as LogEntry import Polysemy.Log.Data.LogEntry (LogEntry) import qualified Polysemy.Log.Data.LogMessage as LogMessage import Polysemy.Log.Data.LogMessage (LogMessage) import Polysemy.Log.Data.Severity (Severity) +import Polysemy.Log.Effect.DataLog (DataLog (DataLog, Local)) +import Polysemy.Log.Effect.Log (Log) import Polysemy.Log.Log (interpretLogDataLog, interpretLogDataLog', interpretLogDataLogConc) -- |Reinterpret 'DataLog' as 'Di.Di', using the provided function to extract the log level from the message. @@ -51,7 +51,7 @@ Members [Di.Di Severity path (LogEntry LogMessage), GhcTime] r => InterpreterFor Log r interpretLogDi = - interpretDataLogDi @_ @path (LogMessage.severity . LogEntry.message) . + interpretDataLogDi @_ @path @(LogEntry LogMessage) (\ m -> m.message.severity) . interpretLogDataLog . raiseUnder {-# inline interpretLogDi #-} @@ -62,7 +62,7 @@ Members [Di.Di Severity path (LogEntry LogMessage), Embed IO] r => InterpretersFor [Log, GhcTime] r interpretLogDi' = - interpretDataLogDi @_ @path (LogMessage.severity . LogEntry.message) . + interpretDataLogDi @_ @path @(LogEntry LogMessage) (\ m -> m.message.severity) . interpretLogDataLog' . raiseUnder . raise2Under @@ -75,7 +75,7 @@ Int -> InterpreterFor Log r interpretLogDiConc maxQueued = - interpretDataLogDi @_ @path (LogMessage.severity . LogEntry.message) . + interpretDataLogDi @_ @path @(LogEntry LogMessage) (\ m -> m.message.severity) . interpretLogDataLogConc maxQueued . raiseUnder {-# inline interpretLogDiConc #-} diff --git a/polysemy-log-di.cabal b/polysemy-log-di.cabal --- a/polysemy-log-di.cabal +++ b/polysemy-log-di.cabal @@ -1,25 +1,25 @@ cabal-version: 2.2 --- This file has been generated from package.yaml by hpack version 0.35.0. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack name: polysemy-log-di -version: 0.9.0.0 -synopsis: Di adapters for Polysemy.Log +version: 0.10.0.0 +synopsis: Di adapters for polysemy-log description: See https://hackage.haskell.org/package/polysemy-log-di/docs/Polysemy-Log-Di.html category: Logging homepage: https://github.com/tek/polysemy-log#readme bug-reports: https://github.com/tek/polysemy-log/issues author: Torsten Schmits maintainer: hackage@tryp.io -copyright: 2022 Torsten Schmits +copyright: 2023 Torsten Schmits license: BSD-2-Clause-Patent license-file: LICENSE build-type: Simple extra-source-files: - changelog.md readme.md + changelog.md source-repository head type: git @@ -35,82 +35,55 @@ default-extensions: AllowAmbiguousTypes ApplicativeDo - BangPatterns - BinaryLiterals BlockArguments - ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass - DeriveDataTypeable - DeriveFoldable - DeriveFunctor - DeriveGeneric - DeriveLift - DeriveTraversable DerivingStrategies DerivingVia DisambiguateRecordFields - DoAndIfThenElse DuplicateRecordFields - EmptyCase - EmptyDataDecls - ExistentialQuantification - FlexibleContexts - FlexibleInstances FunctionalDependencies GADTs - GeneralizedNewtypeDeriving - InstanceSigs - KindSignatures LambdaCase LiberalTypeSynonyms - MultiParamTypeClasses MultiWayIf - NamedFieldPuns OverloadedLabels OverloadedLists OverloadedStrings PackageImports PartialTypeSignatures - PatternGuards PatternSynonyms - PolyKinds QuantifiedConstraints QuasiQuotes - RankNTypes RecordWildCards RecursiveDo RoleAnnotations - ScopedTypeVariables - StandaloneDeriving TemplateHaskell - TupleSections - TypeApplications TypeFamilies TypeFamilyDependencies - TypeOperators - TypeSynonymInstances UndecidableInstances UnicodeSyntax ViewPatterns - ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Widentities -Wunused-packages + OverloadedRecordDot + NoFieldSelectors + ghc-options: -Wall -Widentities -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Wredundant-constraints -Wunused-type-patterns -Wunused-packages build-depends: - base >=4.12 && <5 + base ==4.* , di-polysemy ==0.2.* - , incipit-core >=0.4 - , polysemy - , polysemy-conc ==0.12.* - , polysemy-log + , incipit-core >=0.4 && <0.6 + , polysemy ==1.9.* + , polysemy-conc >=0.12 && <0.14 + , polysemy-log >=0.10.0.0 && <0.11 , polysemy-time ==0.6.* , stm mixins: base hiding (Prelude) , incipit-core (IncipitCore as Prelude) , incipit-core hiding (IncipitCore) - default-language: Haskell2010 + default-language: GHC2021 -test-suite polysemy-log-di-unit +test-suite polysemy-log-di-test type: exitcode-stdio-1.0 main-is: Main.hs other-modules: @@ -120,77 +93,50 @@ default-extensions: AllowAmbiguousTypes ApplicativeDo - BangPatterns - BinaryLiterals BlockArguments - ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass - DeriveDataTypeable - DeriveFoldable - DeriveFunctor - DeriveGeneric - DeriveLift - DeriveTraversable DerivingStrategies DerivingVia DisambiguateRecordFields - DoAndIfThenElse DuplicateRecordFields - EmptyCase - EmptyDataDecls - ExistentialQuantification - FlexibleContexts - FlexibleInstances FunctionalDependencies GADTs - GeneralizedNewtypeDeriving - InstanceSigs - KindSignatures LambdaCase LiberalTypeSynonyms - MultiParamTypeClasses MultiWayIf - NamedFieldPuns OverloadedLabels OverloadedLists OverloadedStrings PackageImports PartialTypeSignatures - PatternGuards PatternSynonyms - PolyKinds QuantifiedConstraints QuasiQuotes - RankNTypes RecordWildCards RecursiveDo RoleAnnotations - ScopedTypeVariables - StandaloneDeriving TemplateHaskell - TupleSections - TypeApplications TypeFamilies TypeFamilyDependencies - TypeOperators - TypeSynonymInstances UndecidableInstances UnicodeSyntax ViewPatterns - ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Widentities -Wunused-packages -threaded -rtsopts -with-rtsopts=-N + OverloadedRecordDot + NoFieldSelectors + ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall -Widentities -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Wredundant-constraints -Wunused-type-patterns -Wunused-packages build-depends: - base >=4.12 && <5 - , incipit-core >=0.4 - , polysemy + base ==4.* + , incipit-core >=0.4 && <0.6 + , polysemy ==1.9.* , polysemy-log , polysemy-log-di - , polysemy-test >=0.6 + , polysemy-test >=0.6 && <0.9 , stm - , tasty + , tasty ==1.4.* mixins: base hiding (Prelude) , incipit-core (IncipitCore as Prelude) , incipit-core hiding (IncipitCore) - default-language: Haskell2010 + default-language: GHC2021 diff --git a/test/Polysemy/Log/Di/Test/SimpleTest.hs b/test/Polysemy/Log/Di/Test/SimpleTest.hs --- a/test/Polysemy/Log/Di/Test/SimpleTest.hs +++ b/test/Polysemy/Log/Di/Test/SimpleTest.hs @@ -28,4 +28,4 @@ test_simpleDi = do runTestAuto do msgs <- interpretDiAtomic @Severity @() @(LogEntry LogMessage) (interpretLogDi' @() prog) - assertEq @_ @IO target (LogEntry.message <$> msgs) + assertEq @_ @IO target ((.message) <$> msgs)