f21ebc9 · typeable/control-logger

git.iko.soy/typeable/control-logger

adjust for ghc-9.6.3

commitf21ebc987c684821955187b61ae8c799e22eb6ba authorDmitry Olshansky <olshanskydr@gmail.com> dateWed 3 Jan 2024, 22:27 (3 years ago) parentb4eb0e1

2 files changed+12−8

compare with master

unifiedsplit

src/Control/Logger.hs+11−7 src/Control/Logger/Internal.hs+1−1

src/Control/Logger.hs+11−7

@@ -1,4 +1,4 @@

1−

1+{-# LANGUAGE CPP #-}

22module Control.Logger

33 ( Logger

44 , loggerContext

@@ -36,16 +36,20 @@ module Control.Logger

3636

3737import Control.Has

3838import Control.Logger.Internal

39−import Control.Logger.Orphans ()

39+import Control.Logger.Orphans ()

4040import Control.Monad.Catch

41−import qualified Data.List as List

42−import Data.Text (Text)

43−import qualified Data.Text as Text

41+import qualified Data.List as List

42+import Data.Text (Text)

43+import qualified Data.Text as Text

4444import Data.Time

4545import GHC.Stack

46−import Katip (ToObject(..))

46+import Katip (ToObject (..))

4747import System.Log.FastLogger

48−import Text.Shakespeare.Text (st)

48+import Text.Shakespeare.Text (st)

49+#if MIN_VERSION_base(4,18,0)

50+import Control.Monad

51+#else

52+#endif

4953

5054logError

5155 :: (LoggingMonad r m)

src/Control/Logger/Internal.hs+1−1

@@ -1,4 +1,5 @@

11{-# LANGUAGE TemplateHaskell #-}

2+{-# LANGUAGE CPP #-}

34module Control.Logger.Internal

45 ( Logger(..)

@@ -16,7 +17,6 @@ import Control.Lens

1617import Control.DeepSeq

1718import Data.Aeson (ToJSON, FromJSON, Object)

1819import Data.Text (Text)

19−import GHC.Generics (Generic)

2020import GHC.Stack

2121

2222