eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

More Werror fixes

Browse source
This commit is contained in:
Julian K. Arni 2015-09-23 20:30:45 +02:00
parent 3c3efda0d5
commit 487f323f2f
2 changed files with 3 additions and 4 deletions
servant-foreign/src/Servant
Foreign.hs
servant-js/src/Servant/JS
Internal.hs

4
servant-foreign/src/Servant/Foreign.hs
View file

@ -4,7 +4,6 @@
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE NullaryTypeClasses #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
@ -47,7 +46,8 @@ module Servant.Foreign
#if !MIN_VERSION_base(4,8,0) #if !MIN_VERSION_base(4,8,0)
import Control.Applicative import Control.Applicative
#endif #endif
import Control.Lens hiding (List) import Control.Lens (makeLenses, (%~), (&), (.~),
(<>~), _last)
import Data.Char (toLower, toUpper) import Data.Char (toLower, toUpper)
import Data.List import Data.List
import Data.Proxy import Data.Proxy

3
servant-js/src/Servant/JS/Internal.hs
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
module Servant.JS.Internal module Servant.JS.Internal
( JavaScriptGenerator ( JavaScriptGenerator
, CommonGeneratorOptions(..) , CommonGeneratorOptions(..)
@ -32,7 +31,7 @@ module Servant.JS.Internal
, Header , Header
) where ) where
import Control.Lens hiding (List) import Control.Lens ((^.))
import qualified Data.CharSet as Set import qualified Data.CharSet as Set
import qualified Data.CharSet.Unicode.Category as Set import qualified Data.CharSet.Unicode.Category as Set
import Data.List import Data.List