git.iko.soy/typeable/yaml
on master help sign in
Fix warnings
831f4b7Matej Kollar
Data/Yaml.hs−2
compare with master
unifiedsplit
@@ -68,8 +68,6 @@ import Control.Exception
68import qualified Data.Conduit as C
68import qualified Data.Conduit as C
69import qualified Data.Conduit.List as CL
69import qualified Data.Conduit.List as CL
70import qualified Data.Vector as V
70import qualified Data.Vector as V
71−import Data.Text (Text)
72−import qualified Data.Text as T
73import Data.Text.Encoding (encodeUtf8)
71import Data.Text.Encoding (encodeUtf8)
74import qualified Data.HashMap.Strict as M
72import qualified Data.HashMap.Strict as M
75import qualified Data.HashSet as HashSet
73import qualified Data.HashSet as HashSet
Data/Yaml/Builder.hs+3−3
@@ -23,10 +23,11 @@ import Data.ByteString (ByteString)
23import Text.Libyaml
23import Text.Libyaml
24import Data.Yaml.Internal
24import Data.Yaml.Internal
25import Data.Text (Text)
25import Data.Text (Text)
26+#if MIN_VERSION_aeson(0, 7, 0)
26import Data.Scientific (Scientific)
27import Data.Scientific (Scientific)
27import Data.Aeson.Types (Value(..))
28import Data.Aeson.Types (Value(..))
29+#endif
28import qualified Data.HashSet as HashSet
30import qualified Data.HashSet as HashSet
29−import qualified Data.Text as T
30import Data.Text.Encoding (encodeUtf8)
31import Data.Text.Encoding (encodeUtf8)
31import System.IO.Unsafe (unsafePerformIO)
32import System.IO.Unsafe (unsafePerformIO)
32import Control.Arrow (second)
33import Control.Arrow (second)
@@ -38,7 +39,6 @@ import qualified Data.Text.Lazy as TL
38import Data.Text.Lazy.Builder (toLazyText)
39import Data.Text.Lazy.Builder (toLazyText)
39import Data.Aeson.Encode (encodeToTextBuilder)
40import Data.Aeson.Encode (encodeToTextBuilder)
40#else
41#else
41−import qualified Data.ByteString.Char8 as S8
42import Data.Attoparsec.Number
42import Data.Attoparsec.Number
43#endif
43#endif
44import Prelude hiding (null)
44import Prelude hiding (null)
@@ -89,7 +89,7 @@ string s =
89 | otherwise = EventScalar (encodeUtf8 s) StrTag PlainNoTag Nothing
89 | otherwise = EventScalar (encodeUtf8 s) StrTag PlainNoTag Nothing
90
90
91-- Use aeson's implementation which gets rid of annoying decimal points
91-- Use aeson's implementation which gets rid of annoying decimal points
92−#if MIN_VERSION_aeson(0,7,0)
92+#if MIN_VERSION_aeson(0, 7, 0)
93scientific :: Scientific -> YamlBuilder
93scientific :: Scientific -> YamlBuilder
94scientific n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag Nothing :)
94scientific n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag Nothing :)
95#else
95#else
Data/Yaml/Internal.hs−1
@@ -19,7 +19,6 @@ import Data.Aeson.Types hiding (parse)
19import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
19import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
20import Data.ByteString (ByteString)
20import Data.ByteString (ByteString)
21import qualified Data.Map as Map
21import qualified Data.Map as Map
22−import Data.Maybe (isNothing)
23import Control.Exception
22import Control.Exception
24import Control.Exception.Enclosed
23import Control.Exception.Enclosed
25import Control.Monad.Trans.State
24import Control.Monad.Trans.State