c41822b · typeable/yaml

git.iko.soy/typeable/yaml

Make the patch more conservative.

With this change, the code for aeson < 2.2 should be identical to what it was before -- so we can be confident it won't break anything that worked before.

commitc41822ba7ccc2afd619a664b5026349b416bd2eb authorJohn MacFarlane <jgm@berkeley.edu> dateThu 29 Jun 2023, 17:08 (3 years ago) parent3ec4100

2 files changed+6−1

compare with master

unifiedsplit

yaml/src/Data/Yaml/Internal.hs+1−1 yaml/test/Data/Yaml/IncludeSpec.hs+5

yaml/src/Data/Yaml/Internal.hs+1−1

@@ -50,7 +50,7 @@ import qualified Data.HashMap.Strict as M

5050import Data.Aeson.Types hiding (AesonException, parse)

5151#else

5252import Data.Aeson.Types hiding (parse)

53−import Data.Aeson.Internal (formatError)

53+import Data.Aeson.Internal (JSONPath, JSONPathElement(..), formatError)

5454#endif

5555import qualified Data.Attoparsec.Text as Atto

5656import Data.Bits (shiftL, (.|.))

yaml/test/Data/Yaml/IncludeSpec.hs+5

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE QuasiQuotes #-}

23{-# LANGUAGE OverloadedStrings #-}

34module Data.Yaml.IncludeSpec (main, spec) where

@@ -6,7 +7,11 @@ import Test.Hspec

67import Data.List (isPrefixOf)

78import qualified Data.ByteString.Lazy as LB

89import Data.Aeson

10+#if MIN_VERSION_aeson(2,2,0)

911import Data.Aeson.Types (JSONPathElement(..))

12+#else

13+import Data.Aeson.Internal (JSONPathElement(..))

14+#endif

1015import Data.Yaml (ParseException(InvalidYaml))

1116import Data.Yaml.Include

1217import Data.Yaml.Internal