487f323 · servant · git.iko.soy

git.iko.soy/servant

on master help sign in

More Werror fixes

487f323Julian K. Arni11 years ago

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

compare with master

unifiedsplit

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

4{-# LANGUAGE FlexibleContexts #-}

5{-# LANGUAGE FlexibleInstances #-}

6{-# LANGUAGE MultiParamTypeClasses #-}

7−{-# LANGUAGE NullaryTypeClasses #-}

8{-# LANGUAGE ScopedTypeVariables #-}

7{-# LANGUAGE ScopedTypeVariables #-}

9{-# LANGUAGE TemplateHaskell #-}

8{-# LANGUAGE TemplateHaskell #-}

10{-# LANGUAGE TypeFamilies #-}

9{-# LANGUAGE TypeFamilies #-}

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

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

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

48import Control.Applicative

47import Control.Applicative

49#endif

48#endif

50−import Control.Lens hiding (List)

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

50+ (<>~), _last)

51import Data.Char (toLower, toUpper)

52import Data.List

53import Data.Proxy

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

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

1−<<<<<<< HEAD

2module Servant.JS.Internal

1module Servant.JS.Internal

3 ( JavaScriptGenerator

2 ( JavaScriptGenerator

4 , CommonGeneratorOptions(..)

3 , CommonGeneratorOptions(..)

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

32 , Header

31 , Header

33 ) where

32 ) where

35−import Control.Lens hiding (List)

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

36import qualified Data.CharSet as Set

35import qualified Data.CharSet as Set

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

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

38import Data.List

37import Data.List