Skip to content

Commit 1d7c091

Browse files
committed
Fix some -Wall warnings
1 parent 45e7bca commit 1d7c091

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

exe/Upload.hs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import Control.Monad
88
import Control.Monad.IO.Class
99
import Network.Socket (withSocketsDo)
1010
import Network.HTTP.Client hiding (Proxy)
11-
import Network.Wai
1211
import Network.Wai.Handler.Warp
1312
import Servant
1413
import Servant.Multipart
@@ -66,14 +65,14 @@ main = do
6665
args <- getArgs
6766
case args of
6867
("run":_) -> withSocketsDo $ do
69-
forkIO startServer
68+
_ <- forkIO startServer
7069
-- we fork the server in a separate thread and send a test
7170
-- request to it from the main thread.
7271
manager <- newManager defaultManagerSettings
7372
boundary <- genBoundary
7473
let burl = BaseUrl Http "localhost" 8080 ""
75-
run cli = runClientM cli (mkClientEnv manager burl)
76-
resp <- run $ client clientApi (boundary, form)
74+
runC cli = runClientM cli (mkClientEnv manager burl)
75+
resp <- runC $ client clientApi (boundary, form)
7776
print resp
7877
_ -> putStrLn "Pass run to run"
7978

src/Servant/Multipart.hs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ import Control.Monad (replicateM)
4747
import Control.Monad.IO.Class
4848
import Control.Monad.Trans.Resource
4949
import Data.Array (listArray, (!))
50-
import Data.Foldable (foldMap, foldl')
51-
import Data.List (find)
50+
import Data.List (find, foldl')
5251
import Data.Maybe
5352
import Data.Monoid
5453
import Data.String.Conversions (cs)
@@ -58,11 +57,11 @@ import Data.Typeable
5857
import Network.HTTP.Media.MediaType ((//), (/:))
5958
import Network.Wai
6059
import Network.Wai.Parse
61-
import Servant
60+
import Servant hiding (contentType)
6261
import Servant.API.Modifiers (FoldLenient)
6362
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)
6665
import Servant.Server.Internal
6766
import Servant.Types.SourceT (SourceT(..), source, StepT(..), fromActionStep)
6867
import System.Directory
@@ -535,7 +534,7 @@ instance MultipartBackend Mem where
535534

536535
defaultBackendOptions _ = ()
537536
loadFile _ = source . pure
538-
backend _ opts _ = lbsBackEnd
537+
backend _ _ _ = lbsBackEnd
539538

540539
-- | Configuration for the temporary file based backend.
541540
--
@@ -579,8 +578,8 @@ instance LookupContext '[] a where
579578

580579
instance {-# OVERLAPPABLE #-}
581580
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
584583

585584
instance {-# OVERLAPPING #-}
586585
LookupContext cs a => LookupContext (a ': cs) a where

0 commit comments

Comments
 (0)