diff --git a/src/Foundation/Servant/Types.hs b/src/Foundation/Servant/Types.hs index bad5f0967..9beca8114 100644 --- a/src/Foundation/Servant/Types.hs +++ b/src/Foundation/Servant/Types.hs @@ -18,7 +18,7 @@ import Data.Proxy import Servant.API import Servant.API.Modifiers (FoldRequired) -import Servant.API.Description +--import Servant.API.Description -- commented out in version bump; perhaps still needed? import Servant.Swagger import Servant.Docs import Servant.Server @@ -112,8 +112,9 @@ instance HasSwagger sub => HasSwagger (CaptureBearerRestriction' mods restr :> s instance HasSwagger sub => HasSwagger (CaptureBearerToken' mods :> sub) where toSwagger _ = toSwagger $ Proxy @sub -instance (HasSwagger sub, ToParamSchema ciphertext, KnownSymbol sym, KnownSymbol (FoldDescription mods)) => HasSwagger (CaptureCryptoID' mods ciphertext sym plaintext :> sub) where - toSwagger _ = toSwagger $ Proxy @(Capture' mods sym (CryptoID ciphertext plaintext) :> sub) +-- versionbump: Could not deduce (KnownSymbol (CryptoIDNamespace ciphertext plaintext)) +--instance (HasSwagger sub, ToParamSchema ciphertext, KnownSymbol sym, KnownSymbol (FoldDescription mods)) => HasSwagger (CaptureCryptoID' mods ciphertext sym plaintext :> sub) where +-- toSwagger _ = toSwagger $ Proxy @(Capture' mods sym (CryptoID ciphertext plaintext) :> sub) instance HasSwagger sub => HasSwagger (ApiVersion major minor patch :> sub) where toSwagger _ = toSwagger $ Proxy @sub @@ -126,8 +127,9 @@ instance HasDocs sub => HasDocs (CaptureBearerToken' mods :> sub) where docsFor _ (endpoint, action) = docsFor (Proxy @sub) (endpoint, action') where action' = action & notes <>~ [DocNote "Bearer token" ["The behaviour of this route dependes on the exact bearer token used for authorization"]] -instance (ToCapture (Capture sym ciphertext), KnownSymbol sym, HasDocs sub) => HasDocs (CaptureCryptoID' mods ciphertext sym plaintext :> sub) where - docsFor _ = docsFor $ Proxy @(Capture' mods sym ciphertext :> sub) +-- also versionbump +--instance (ToCapture (Capture sym ciphertext), KnownSymbol sym, HasDocs sub) => HasDocs (CaptureCryptoID' mods ciphertext sym plaintext :> sub) where +-- docsFor _ = docsFor $ Proxy @(Capture' mods sym ciphertext :> sub) instance (RunClient m, HasClient m (Capture' mods sym (CryptoID ciphertext plaintext) :> sub)) => HasClient m (CaptureCryptoID' mods ciphertext sym plaintext :> sub) where type Client m (CaptureCryptoID' mods ciphertext sym plaintext :> sub) = Client m (Capture' mods sym (CryptoID ciphertext plaintext) :> sub) diff --git a/src/System/Clock/Instances.hs b/src/System/Clock/Instances.hs index d02087f8c..ec8ea61a0 100644 --- a/src/System/Clock/Instances.hs +++ b/src/System/Clock/Instances.hs @@ -10,7 +10,7 @@ module System.Clock.Instances import ClassyPrelude import System.Clock -import Data.Ratio ((%)) +--import Data.Ratio ((%)) import Data.Fixed