@@ -47,8 +47,7 @@ import Control.Monad (replicateM)
47
47
import Control.Monad.IO.Class
48
48
import Control.Monad.Trans.Resource
49
49
import Data.Array (listArray , (!) )
50
- import Data.Foldable (foldMap , foldl' )
51
- import Data.List (find )
50
+ import Data.List (find , foldl' )
52
51
import Data.Maybe
53
52
import Data.Monoid
54
53
import Data.String.Conversions (cs )
@@ -58,11 +57,11 @@ import Data.Typeable
58
57
import Network.HTTP.Media.MediaType ((//) , (/:) )
59
58
import Network.Wai
60
59
import Network.Wai.Parse
61
- import Servant
60
+ import Servant hiding ( contentType )
62
61
import Servant.API.Modifiers (FoldLenient )
63
62
import Servant.Client.Core (HasClient (.. ), RequestBody (RequestBodySource ), setRequestBody )
64
- import Servant.Docs
65
- import Servant.Foreign
63
+ import Servant.Docs hiding ( samples )
64
+ import Servant.Foreign hiding ( contentType )
66
65
import Servant.Server.Internal
67
66
import Servant.Types.SourceT (SourceT (.. ), source , StepT (.. ), fromActionStep )
68
67
import System.Directory
@@ -535,7 +534,7 @@ instance MultipartBackend Mem where
535
534
536
535
defaultBackendOptions _ = ()
537
536
loadFile _ = source . pure
538
- backend _ opts _ = lbsBackEnd
537
+ backend _ _ _ = lbsBackEnd
539
538
540
539
-- | Configuration for the temporary file based backend.
541
540
--
@@ -579,8 +578,8 @@ instance LookupContext '[] a where
579
578
580
579
instance {-# OVERLAPPABLE #-}
581
580
LookupContext cs a => LookupContext (c ': cs ) a where
582
- lookupContext p (c :. cs ) =
583
- lookupContext p cs
581
+ lookupContext p (_ :. cxts ) =
582
+ lookupContext p cxts
584
583
585
584
instance {-# OVERLAPPING #-}
586
585
LookupContext cs a => LookupContext (a ': cs ) a where
0 commit comments