Skip to content

aeson-2.0.0.0 support #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mirokuratczyk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

aeson-2.0.0.0 support #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/Text/Toml/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-}

Expand All @@ -19,6 +20,9 @@ import Text.Parsec
import Data.Aeson.Types
import Data.HashMap.Strict (HashMap)
import qualified Data.HashMap.Strict as M
#if MIN_VERSION_aeson(2,0,0)
import qualified Data.Aeson.KeyMap as KM
#endif
import Data.Int (Int64)
import Data.List (intersect)
import Data.Set (Set)
Expand Down Expand Up @@ -190,9 +194,20 @@ instance (ToBsJSON a) => ToBsJSON (Vector a) where

-- | Provide a 'toBsJSON' instance to the 'NTable'.
instance (ToBsJSON v) => ToBsJSON (M.HashMap Text v) where
#if MIN_VERSION_aeson(2,0,0)
toBsJSON = Object . KM.fromHashMapText . M.map toBsJSON
#else
toBsJSON = Object . M.map toBsJSON
#endif
{-# INLINE toBsJSON #-}

-- | 'ToBsJSON' instance for 'KeyMap'.
#if MIN_VERSION_aeson(2,0,0)
instance (ToBsJSON v) => ToBsJSON (KM.KeyMap v) where
toBsJSON = Object . KM.map toBsJSON
{-# INLINE toBsJSON #-}
#endif

-- | 'ToBsJSON' instances for the 'TValue' type that produce Aeson (JSON)
-- in line with BurntSushi's language agnostic TOML test suite.
--
Expand Down