487f323 · servant · git.iko.soy

git.iko.soy/servant

More Werror fixes

commit487f323f2f99dd005ebb6f78c4f7f82f881b5593 authorJulian K. Arni <jkarni@gmail.com> dateWed 23 Sep 2015, 20:30 (11 years ago) parent3c3efda

2 files changed+3−4

unifiedsplit

servant-foreign/src/Servant/Foreign.hs+2−2

@@ -4,7 +4,6 @@

44{-# LANGUAGE FlexibleContexts #-}

55{-# LANGUAGE FlexibleInstances #-}

66{-# LANGUAGE MultiParamTypeClasses #-}

7−{-# LANGUAGE NullaryTypeClasses #-}

87{-# LANGUAGE ScopedTypeVariables #-}

98{-# LANGUAGE TemplateHaskell #-}

109{-# LANGUAGE TypeFamilies #-}

@@ -47,7 +46,8 @@ module Servant.Foreign

4746#if !MIN_VERSION_base(4,8,0)

4847import Control.Applicative

4948#endif

50−import Control.Lens hiding (List)

49+import Control.Lens (makeLenses, (%~), (&), (.~),

50+ (<>~), _last)

5151import Data.Char (toLower, toUpper)

5252import Data.List

5353import Data.Proxy

servant-js/src/Servant/JS/Internal.hs+1−2

@@ -1,4 +1,3 @@

1−<<<<<<< HEAD

21module Servant.JS.Internal

32 ( JavaScriptGenerator

43 , CommonGeneratorOptions(..)

@@ -32,7 +31,7 @@ module Servant.JS.Internal

3231 , Header

3332 ) where

3433

35−import Control.Lens hiding (List)

34+import Control.Lens ((^.))

3635import qualified Data.CharSet as Set

3736import qualified Data.CharSet.Unicode.Category as Set

3837import Data.List