mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

factor out Utility.Aeson.textKey

Browse source
This commit is contained in:
Joey Hess 2022-03-02 18:24:06 -04:00
parent a314a8dfd0
commit cbd138e042
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 17 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Types/MetaData.hs
View file

@ -7,7 +7,6 @@
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
module Types.MetaData (
MetaData(..),
@ -52,9 +51,6 @@ import Utility.QuickCheck
import Utility.Aeson
import Types.UUID
#if MIN_VERSION_aeson(2,0,0)
import qualified Data.Aeson.Key as AK
#endif
import qualified Data.Text as T
import qualified Data.Text.Encoding as E
import qualified Data.Set as S
@ -71,13 +67,7 @@ newtype MetaData = MetaData (M.Map MetaField (S.Set MetaValue))
instance ToJSON' MetaData where
toJSON' (MetaData m) = object $ map go (M.toList m)
where
go (MetaField f, s) =
(
#if MIN_VERSION_aeson(2,0,0)
AK.fromText $
#endif
CI.original f
, toJSON' s)
go (MetaField f, s) = (textKey (CI.original f), toJSON' s)
instance FromJSON MetaData where
parseJSON (Object o) = do