on master help sign in
Fix warnings
commit831f4b72289cd7de350f3814af6def2fb664bfb9 authorMatej Kollar <208115@mail.muni.cz> dateSat 5 Sep 2015, 23:37 (11 years ago) parent7c6de23
3 files changed+3−6
Data/Yaml.hs−2 Data/Yaml/Builder.hs+3−3 Data/Yaml/Internal.hs−1
Data/Yaml.hs−2
@@ -68,8 +68,6 @@ import Control.Exception
6868import qualified Data.Conduit as C
6969import qualified Data.Conduit.List as CL
7070import qualified Data.Vector as V
71−import Data.Text (Text)
72−import qualified Data.Text as T
7371import Data.Text.Encoding (encodeUtf8)
7472import qualified Data.HashMap.Strict as M
7573import qualified Data.HashSet as HashSet
Data/Yaml/Builder.hs+3−3
@@ -23,10 +23,11 @@ import Data.ByteString (ByteString)
2323import Text.Libyaml
2424import Data.Yaml.Internal
2525import Data.Text (Text)
26+#if MIN_VERSION_aeson(0, 7, 0)
2627import Data.Scientific (Scientific)
2728import Data.Aeson.Types (Value(..))
29+#endif
2830import qualified Data.HashSet as HashSet
29−import qualified Data.Text as T
3031import Data.Text.Encoding (encodeUtf8)
3132import System.IO.Unsafe (unsafePerformIO)
3233import Control.Arrow (second)
@@ -38,7 +39,6 @@ import qualified Data.Text.Lazy as TL
3839import Data.Text.Lazy.Builder (toLazyText)
3940import Data.Aeson.Encode (encodeToTextBuilder)
4041#else
41−import qualified Data.ByteString.Char8 as S8
4242import Data.Attoparsec.Number
4343#endif
4444import Prelude hiding (null)
@@ -89,7 +89,7 @@ string s =
8989 | otherwise = EventScalar (encodeUtf8 s) StrTag PlainNoTag Nothing
9090
9191-- 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)
9393scientific :: Scientific -> YamlBuilder
9494scientific n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag Nothing :)
9595#else
Data/Yaml/Internal.hs−1
@@ -19,7 +19,6 @@ import Data.Aeson.Types hiding (parse)
1919import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
2020import Data.ByteString (ByteString)
2121import qualified Data.Map as Map
22−import Data.Maybe (isNothing)
2322import Control.Exception
2423import Control.Exception.Enclosed
2524import Control.Monad.Trans.State