servant-multipart 0.11.1 → 0.11.2
raw patch · 3 files changed
+19/−13 lines, 3 filesdep ~lensdep ~servantdep ~servant-docsPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: lens, servant, servant-docs, servant-server
API changes (from Hackage documentation)
- Servant.Multipart: instance Servant.Utils.Links.HasLink sub => Servant.Utils.Links.HasLink (Servant.Multipart.MultipartForm a Servant.API.Sub.:> sub)
+ Servant.Multipart: instance Servant.Utils.Links.HasLink sub => Servant.Utils.Links.HasLink (Servant.Multipart.MultipartForm tag a Servant.API.Sub.:> sub)
Files
- CHANGELOG.md +6/−1
- servant-multipart.cabal +6/−5
- src/Servant/Multipart.hs +7/−7
CHANGELOG.md view
@@ -1,5 +1,10 @@+0.11.2+------++- Support `servant-0.14`+ 0.11.1------+------ - Support `servant-0.13` - Export MultipartBackend and TmpBackendOptions
servant-multipart.cabal view
@@ -1,5 +1,5 @@ name: servant-multipart-version: 0.11.1+version: 0.11.2 synopsis: multipart/form-data (e.g file upload) support for servant description: This package adds support for file upload to the servant ecosystem. It draws@@ -20,7 +20,8 @@ GHC==7.8.4, GHC==7.10.3, GHC==8.0.2,- GHC==8.2.2+ GHC==8.2.2,+ GHC==8.4.3 library hs-source-dirs: src@@ -32,9 +33,9 @@ http-media >= 0.6 && <0.8, lens >= 4.0 && < 4.17, resourcet >=1.1 && <1.3,- servant >=0.10 && <0.14,- servant-docs >=0.10 && <0.14,- servant-server >=0.10 && <0.14,+ servant >=0.10 && <0.15,+ servant-docs >=0.10 && <0.15,+ servant-server >=0.10 && <0.15, text >=1.2 && <1.3, transformers >=0.3 && <0.6, wai >= 3.2 && <3.3,
src/Servant/Multipart.hs view
@@ -36,26 +36,21 @@ ) where import Control.Lens ((<>~), (&), view)-import Control.Monad import Control.Monad.IO.Class import Control.Monad.Trans.Resource-import Data.ByteString.Lazy (ByteString) import Data.Foldable (foldMap)-import Data.Function import Data.List (find) import Data.Maybe import Data.Monoid import Data.Text (Text, unpack) import Data.Text.Encoding (decodeUtf8) import Data.Typeable-import Network.HTTP.Media ((//)) import Network.Wai import Network.Wai.Parse import Servant import Servant.Docs import Servant.Server.Internal import System.Directory-import System.IO import qualified Data.ByteString as SBS import qualified Data.ByteString.Lazy as LBS@@ -429,9 +424,14 @@ LookupContext cs a => LookupContext (a ': cs) a where lookupContext _ (c :. _) = Just c -instance HasLink sub => HasLink (MultipartForm a :> sub) where- type MkLink (MultipartForm a :> sub) = MkLink sub+instance HasLink sub => HasLink (MultipartForm tag a :> sub) where+#if MIN_VERSION_servant(0,14,0)+ type MkLink (MultipartForm tag a :> sub) r = MkLink sub r+ toLink toA _ = toLink toA (Proxy :: Proxy sub)+#else+ type MkLink (MultipartForm tag a :> sub) = MkLink sub toLink _ = toLink (Proxy :: Proxy sub)+#endif -- | The 'ToMultipartSample' class allows you to create sample 'MultipartData' -- inputs for your type for use with "Servant.Docs". This is used by the