c505144 · typeable/yaml

git.iko.soy/typeable/yaml

Fix some warnings

commitc5051449f8329e9f65c6b2837fe4f8bcb4332399 authorMichael Snoyman <michael@snoyman.com> dateSun 6 Sep 2015, 17:21 (11 years ago) parent8aa517f

4 files changed+8−3

compare with master

unifiedsplit

Data/Yaml/Internal.hs+2 Data/Yaml/Parser.hs+3−1 Text/Libyaml.hs+2 exe/json2yaml.hs+1−2

Data/Yaml/Internal.hs+2

@@ -27,7 +27,9 @@ import qualified Data.Conduit.List as CL

2727import Control.Monad.Trans.Class (MonadTrans, lift)

2828import Control.Monad.IO.Class (MonadIO, liftIO)

2929import Control.Monad (liftM, ap)

30+#if !MIN_VERSION_base(4,8,0)

3031import Control.Applicative (Applicative(..))

32+#endif

3133import Data.Char (toUpper)

3234import qualified Data.Vector as V

3335import Data.Text (Text, pack)

Data/Yaml/Parser.hs+3−1

@@ -6,8 +6,10 @@

66module Data.Yaml.Parser where

88import Text.Libyaml

9−import Control.Applicative ((<$>), Applicative (..), Alternative (..))

9+import Control.Applicative

10+#if !MIN_VERSION_base(4,8,0)

1011import Data.Monoid (Monoid (..))

12+#endif

1113import Control.Monad (MonadPlus (..), liftM, ap)

1214import Control.Monad.Trans.Writer.Strict (tell, WriterT)

1315import Control.Monad.Trans.Class (lift)

Text/Libyaml.hs+2

@@ -49,7 +49,9 @@ import Data.Data

4949import Control.Monad.IO.Class

5050

5151import Control.Exception (throwIO, Exception, finally)

52+#if !MIN_VERSION_base(4,8,0)

5253import Control.Applicative

54+#endif

5355import Control.Monad.Trans.Resource

5456import Data.Conduit hiding (Source, Sink, Conduit)

5557import Control.Exception (mask_)

exe/json2yaml.hs+1−2

@@ -6,14 +6,13 @@ import qualified Data.Yaml as Y

66import Control.Monad (when)

77import qualified Data.ByteString as S

88import qualified Data.ByteString.Lazy as L

9−import Control.Applicative ((<$>))

109

1110main :: IO ()

1211main = do

1312 args <- getArgs

1413 when (length args > 2) $ error "Usage: json2yaml [in] [out]"

1514 let (input:output:_) = args ++ repeat "-"

16− mval <- J.decode <$>

15+ mval <- fmap J.decode $

1716 case input of

1817 "-" -> L.getContents

1918 _ -> L.readFile input