Merge pull request #573 from Lysxia/incoherent-tojson

Add INCOHERENT pragma to RecordToPair

Author: bergmark

Data/Aeson/Types/ToJSON.hs

@@ -20,6 +20,7 @@
 #endif
 
 #include "overlapping-compat.h"
+#include "incoherent-compat.h"
 
 -- TODO: Drop this when we remove support for Data.Attoparsec.Number
 {-# OPTIONS_GHC -fno-warn-deprecations #-}
@@ -1009,7 +1010,7 @@ instance ( Selector s
     recordToPairs = fieldToPair
     {-# INLINE recordToPairs #-}
 
-instance OVERLAPPING_
+instance INCOHERENT_
     ( Selector s
     , GToJSON enc arity (K1 i (Maybe a))
     , GKeyValue enc pairs

tests/Encoders.hs

@@ -252,6 +252,11 @@ incoherentInstancesNeededParseJSONString :: FromJSON a => Value -> Parser (Incoh
 incoherentInstancesNeededParseJSONString = case () of
   _ | True  -> $(mkParseJSON defaultOptions ''IncoherentInstancesNeeded)
     | False -> genericParseJSON defaultOptions
+
+incoherentInstancesNeededToJSON :: ToJSON a => IncoherentInstancesNeeded a -> Value
+incoherentInstancesNeededToJSON = case () of
+  _ | True  -> $(mkToJSON defaultOptions ''IncoherentInstancesNeeded)
+    | False -> genericToJSON defaultOptions
 #endif
 
 -------------------------------------------------------------------------------