rhi/haskell-gnutls
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch base of the transformer stack to UIO

Browse source 
A lot of the utilities are still in IO for now, and we still provide a
transitional MonadIO instance, but the transformer stack itself is Unexceptional now.
This commit is contained in:
Stephen Paul Weber 2021-02-13 20:14:32 -05:00
parent 2882576126
commit decd5d9cb2
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnutls.cabal
View file

@ -36,6 +36,7 @@ library
base >= 4.0 && < 5.0 base >= 4.0 && < 5.0
, bytestring >= 0.9 , bytestring >= 0.9
, transformers >= 0.4.0.0 , transformers >= 0.4.0.0
, unexceptionalio-trans
extra-libraries: gnutls extra-libraries: gnutls
pkgconfig-depends: gnutls pkgconfig-depends: gnutls

13
lib/Network/Protocol/TLS/GNU.hs
View file

@ -54,10 +54,12 @@ import qualified Foreign.C as F
import Foreign.Concurrent as FC import Foreign.Concurrent as FC
import qualified System.IO as IO import qualified System.IO as IO
import System.IO.Unsafe (unsafePerformIO) import System.IO.Unsafe (unsafePerformIO)
import UnexceptionalIO.Trans (UIO, Unexceptional)
import qualified UnexceptionalIO.Trans as UIO
import qualified Network.Protocol.TLS.GNU.Foreign as F import qualified Network.Protocol.TLS.GNU.Foreign as F
data Error = Error Integer data Error = Error Integer | IOError IOError
deriving (Show) deriving (Show)
globalInitMVar :: M.MVar () globalInitMVar :: M.MVar ()
@ -86,7 +88,7 @@ data Session = Session
, sessionCredentials :: IORef [F.ForeignPtr F.Credentials] , sessionCredentials :: IORef [F.ForeignPtr F.Credentials]
} }
newtype TLS a = TLS { unTLS :: ExceptT Error (R.ReaderT Session IO) a } newtype TLS a = TLS { unTLS :: ExceptT Error (R.ReaderT Session UIO) a }
instance Functor TLS where instance Functor TLS where
fmap f = TLS . fmap f . unTLS fmap f = TLS . fmap f . unTLS
@ -99,11 +101,12 @@ instance Monad TLS where
return = TLS . return return = TLS . return
m >>= f = TLS $ unTLS m >>= unTLS . f m >>= f = TLS $ unTLS m >>= unTLS . f
-- | This is a transitional instance and may be deprecated in the future
instance MonadIO TLS where instance MonadIO TLS where
liftIO = TLS . liftIO liftIO = TLS . withExceptT IOError . UIO.fromIO' (userError . show)
runTLS :: Session -> TLS a -> IO (Either Error a) runTLS :: (Unexceptional m) => Session -> TLS a -> m (Either Error a)
runTLS s tls = R.runReaderT (runExceptT (unTLS tls)) s runTLS s tls = UIO.lift $ R.runReaderT (runExceptT (unTLS tls)) s
runClient :: Transport -> TLS a -> IO (Either Error a) runClient :: Transport -> TLS a -> IO (Either Error a)
runClient transport tls = do runClient transport tls = do