core-webserver-servant 0.1.1.1 → 0.1.1.2

raw patch · 2 files changed

+8/−7 lines, 2 filesdep ~core-programPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: core-program

API changes (from Hackage documentation)

Files

• core-webserver-servant.cabal +2/−2
• lib/Core/Webserver/Servant.hs +6/−5

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           core-webserver-servant-version:        0.1.1.1+version:        0.1.1.2 synopsis:       Interoperability with Servant description:    This is part of a library to help build command-line programs, both tools and                 longer-running daemons.@@ -38,7 +38,7 @@   ghc-options: -Wall -Wwarn -fwarn-tabs   build-depends:       base >=4.11 && <5-    , core-program+    , core-program >=0.5.0     , core-telemetry     , core-webserver-warp     , mtl

@@ -1,5 +1,6 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE ImportQualifiedPost #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-}@@ -31,19 +32,19 @@     prepareRoutesWithContext, ) where +import Control.Exception.Safe qualified as Safe (try, throw) import Control.Monad.Except (ExceptT (..)) import Core.Program import Core.System (Exception (..))-import Core.Telemetry.Observability (clearMetrics) import Core.Webserver.Warp import Data.Proxy (Proxy) import GHC.Base (Type) import Network.Wai (Application)-import qualified Servant as Servant (+import Servant qualified as Servant (     Handler (..),     ServerT,  )-import qualified Servant.Server as Servant (+import Servant.Server qualified as Servant (     Context (..),     HasServer,     ServerContext,@@ -108,7 +109,7 @@          context <- case contextFromRequest @τ request of             Just context' -> pure context'-            Nothing -> throw ContextNotFoundInRequest+            Nothing -> Safe.throw ContextNotFoundInRequest         Servant.serveWithContextT             proxy             sContext@@ -120,7 +121,7 @@     transformProgram :: Context τ -> Program τ α -> Servant.Handler α     transformProgram context program =         let output =-                try $+                Safe.try $                     subProgram context $ do                         program          in Servant.Handler (ExceptT output)