-

Author: functora

pub/functora/src/bolt11/Functora/Bolt11.hs

@@ -39,7 +39,7 @@ import qualified Data.ByteString as BS
 import qualified Data.ByteString.Base16 as B16
 import qualified Data.ByteString.Builder as BS
 import qualified Data.ByteString.Lazy.Char8 as BL
-import Functora.Prelude hiding (error)
+import Functora.Prelude hiding (error, show)
 import Prelude (Show (..), error)
 
 newtype Hex = Hex

pub/functora/src/prelude/Functora/Prelude.hs

@@ -298,6 +298,7 @@ import Data.Time.Clock as X
     diffTimeToPicoseconds,
     diffUTCTime,
     nominalDay,
+    picosecondsToDiffTime,
     secondsToDiffTime,
   )
 import qualified Data.Time.Clock as Clock
@@ -340,7 +341,6 @@ import Universum as X hiding
     break,
     catch,
     catchAny,
-    decodeUtf8',
     drop,
     filter,
     finally,
@@ -357,7 +357,6 @@ import Universum as X hiding
     preview,
     print,
     set,
-    show,
     state,
     swap,
     tails,

pub/functora/src/prelude/Functora/PreludeOrphan.hs

@@ -3,6 +3,7 @@
 
 module Functora.PreludeOrphan () where
 
+import Control.Exception.Safe (throw)
 import Data.Binary (Binary)
 import qualified Data.Coerce as Coerce
 import qualified Data.Data as Data
@@ -15,6 +16,7 @@ import Functora.Witch
 import Text.URI
 import qualified Type.Reflection as Reflection
 import Universum
+import UnliftIO (MonadUnliftIO (..))
 import qualified Prelude
 #if defined(__GHCJS__) || defined(ghcjs_HOST_OS) || defined(wasi_HOST_OS)
 import Data.JSString (JSString)
@@ -123,6 +125,19 @@ withTarget ::
 withTarget =
   Coerce.coerce
 
+instance
+  ( Exception e,
+    MonadCatch m,
+    MonadUnliftIO m
+  ) =>
+  MonadUnliftIO (ExceptT e m)
+  where
+  withRunInIO inner =
+    ExceptT . try $ withRunInIO $ \run ->
+      inner
+        $ run
+        . (either throw pure <=< runExceptT)
+
 #if defined(__GHCJS__) || defined(ghcjs_HOST_OS) || defined(wasi_HOST_OS)
 
 instance From String JSString where

pub/proto-lens/proto-lens/src/Data/ProtoLens/Encoding/Wire.hs

@@ -7,6 +7,10 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 module Data.ProtoLens.Encoding.Wire
     ( Tag(..)
     , TaggedValue(..)
@@ -21,6 +25,8 @@ module Data.ProtoLens.Encoding.Wire
     , parseMessageSetTaggedValueFromWire
     ) where
 
+import Data.Data
+import GHC.Generics
 import Control.DeepSeq (NFData(..))
 import Data.Bits ((.&.), (.|.), shiftL, shiftR)
 import qualified Data.ByteString as B
@@ -36,6 +42,10 @@ import Data.ProtoLens.Encoding.Bytes
 newtype Tag = Tag { unTag :: Int }
     deriving (Show, Eq, Ord, Num, NFData)
 
+deriving stock instance Read Tag
+deriving stock instance Data Tag
+deriving stock instance Generic Tag
+
 -- | The encoding of some unknown field on the wire.
 data WireValue
     = VarInt !Word64
@@ -46,10 +56,20 @@ data WireValue
     | Fixed32 !Word32
     deriving (Eq, Ord)
 
+deriving stock instance Show WireValue
+deriving stock instance Read WireValue
+deriving stock instance Data WireValue
+deriving stock instance Generic WireValue
+
 -- | A pair of an encoded field and a value.
 data TaggedValue = TaggedValue !Tag !WireValue
     deriving (Eq, Ord)
 
+deriving stock instance Show TaggedValue
+deriving stock instance Read TaggedValue
+deriving stock instance Data TaggedValue
+deriving stock instance Generic TaggedValue
+
 type FieldSet = [TaggedValue]
 
 -- TaggedValue, WireValue and Tag are strict, so their NFData instances are